Skip to content

Commit 00479a4

Browse files
author
[email protected]
committed
wl#2936 post-merge fixes
1 parent 6bc9bc9 commit 00479a4

16 files changed

Lines changed: 79 additions & 89 deletions

File tree

‎client/mysqltest.c‎

Lines changed: 21 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -1525,7 +1525,7 @@ void do_source(struct st_command *command)
15251525
{
15261526
static DYNAMIC_STRING ds_filename;
15271527
const struct command_arg source_args[] = {
1528-
"filename", ARG_STRING, TRUE, &ds_filename, "File to source"
1528+
{ "filename", ARG_STRING, TRUE, &ds_filename, "File to source" }
15291529
};
15301530
DBUG_ENTER("do_source");
15311531

@@ -1911,7 +1911,7 @@ void do_remove_file(struct st_command *command)
19111911
int error;
19121912
static DYNAMIC_STRING ds_filename;
19131913
const struct command_arg rm_args[] = {
1914-
"filename", ARG_STRING, TRUE, &ds_filename, "File to delete"
1914+
{ "filename", ARG_STRING, TRUE, &ds_filename, "File to delete" }
19151915
};
19161916
DBUG_ENTER("do_remove_file");
19171917

@@ -1945,8 +1945,8 @@ void do_copy_file(struct st_command *command)
19451945
static DYNAMIC_STRING ds_from_file;
19461946
static DYNAMIC_STRING ds_to_file;
19471947
const struct command_arg copy_file_args[] = {
1948-
"from_file", ARG_STRING, TRUE, &ds_from_file, "Filename to copy from",
1949-
"to_file", ARG_STRING, TRUE, &ds_to_file, "Filename to copy to"
1948+
{ "from_file", ARG_STRING, TRUE, &ds_from_file, "Filename to copy from" },
1949+
{ "to_file", ARG_STRING, TRUE, &ds_to_file, "Filename to copy to" }
19501950
};
19511951
DBUG_ENTER("do_copy_file");
19521952

@@ -1982,8 +1982,8 @@ void do_chmod_file(struct st_command *command)
19821982
static DYNAMIC_STRING ds_mode;
19831983
static DYNAMIC_STRING ds_file;
19841984
const struct command_arg chmod_file_args[] = {
1985-
"mode", ARG_STRING, TRUE, &ds_mode, "Mode of file",
1986-
"file", ARG_STRING, TRUE, &ds_file, "Filename of file to modify"
1985+
{ "mode", ARG_STRING, TRUE, &ds_mode, "Mode of file" },
1986+
{ "file", ARG_STRING, TRUE, &ds_file, "Filename of file to modify" }
19871987
};
19881988
DBUG_ENTER("do_chmod_file");
19891989

@@ -2020,7 +2020,7 @@ void do_file_exist(struct st_command *command)
20202020
int error;
20212021
static DYNAMIC_STRING ds_filename;
20222022
const struct command_arg file_exist_args[] = {
2023-
"filename", ARG_STRING, TRUE, &ds_filename, "File to check if it exist"
2023+
{ "filename", ARG_STRING, TRUE, &ds_filename, "File to check if it exist" }
20242024
};
20252025
DBUG_ENTER("do_file_exist");
20262026

@@ -2102,8 +2102,8 @@ void do_write_file_command(struct st_command *command, my_bool append)
21022102
static DYNAMIC_STRING ds_filename;
21032103
static DYNAMIC_STRING ds_delimiter;
21042104
const struct command_arg write_file_args[] = {
2105-
"filename", ARG_STRING, TRUE, &ds_filename, "File to write to",
2106-
"delimiter", ARG_STRING, FALSE, &ds_delimiter, "Delimiter to read until"
2105+
{ "filename", ARG_STRING, TRUE, &ds_filename, "File to write to" },
2106+
{ "delimiter", ARG_STRING, FALSE, &ds_delimiter, "Delimiter to read until" }
21072107
};
21082108
DBUG_ENTER("do_write_file");
21092109

@@ -2211,7 +2211,7 @@ void do_cat_file(struct st_command *command)
22112211
char buff[512];
22122212
static DYNAMIC_STRING ds_filename;
22132213
const struct command_arg cat_file_args[] = {
2214-
"filename", ARG_STRING, TRUE, &ds_filename, "File to read from"
2214+
{ "filename", ARG_STRING, TRUE, &ds_filename, "File to read from" }
22152215
};
22162216
DBUG_ENTER("do_cat_file");
22172217

@@ -2275,8 +2275,8 @@ void do_diff_files(struct st_command *command)
22752275
static DYNAMIC_STRING ds_filename;
22762276
static DYNAMIC_STRING ds_filename2;
22772277
const struct command_arg diff_file_args[] = {
2278-
"file1", ARG_STRING, TRUE, &ds_filename, "First file to diff",
2279-
"file2", ARG_STRING, TRUE, &ds_filename2, "Second file to diff"
2278+
{ "file1", ARG_STRING, TRUE, &ds_filename, "First file to diff" },
2279+
{ "file2", ARG_STRING, TRUE, &ds_filename2, "Second file to diff" }
22802280
};
22812281
DBUG_ENTER("do_diff_files");
22822282

@@ -2352,7 +2352,7 @@ void do_perl(struct st_command *command)
23522352
static DYNAMIC_STRING ds_script;
23532353
static DYNAMIC_STRING ds_delimiter;
23542354
const struct command_arg perl_args[] = {
2355-
"delimiter", ARG_STRING, FALSE, &ds_delimiter, "Delimiter to read until"
2355+
{ "delimiter", ARG_STRING, FALSE, &ds_delimiter, "Delimiter to read until" }
23562356
};
23572357
DBUG_ENTER("do_perl");
23582358

@@ -3427,18 +3427,14 @@ void do_connect(struct st_command *command)
34273427
static DYNAMIC_STRING ds_sock;
34283428
static DYNAMIC_STRING ds_options;
34293429
const struct command_arg connect_args[] = {
3430-
"connection name", ARG_STRING, TRUE, &ds_connection_name,
3431-
"Name of the connection",
3432-
"host", ARG_STRING, TRUE, &ds_host, "Host to connect to",
3433-
"user", ARG_STRING, FALSE, &ds_user, "User to connect as",
3434-
"passsword", ARG_STRING, FALSE, &ds_password,
3435-
"Password used when connecting",
3436-
"database", ARG_STRING, FALSE, &ds_database,
3437-
"Dtabase to select after connect",
3438-
"port", ARG_STRING, FALSE, &ds_port, "Port to connect to",
3439-
"socket", ARG_STRING, FALSE, &ds_sock, "Socket to connect with",
3440-
"options", ARG_STRING, FALSE, &ds_options,
3441-
"Options to use while connecting"
3430+
{ "connection name", ARG_STRING, TRUE, &ds_connection_name, "Name of the connection" },
3431+
{ "host", ARG_STRING, TRUE, &ds_host, "Host to connect to" },
3432+
{ "user", ARG_STRING, FALSE, &ds_user, "User to connect as" },
3433+
{ "passsword", ARG_STRING, FALSE, &ds_password, "Password used when connecting" },
3434+
{ "database", ARG_STRING, FALSE, &ds_database, "Database to select after connect" },
3435+
{ "port", ARG_STRING, FALSE, &ds_port, "Port to connect to" },
3436+
{ "socket", ARG_STRING, FALSE, &ds_sock, "Socket to connect with" },
3437+
{ "options", ARG_STRING, FALSE, &ds_options, "Options to use while connecting" }
34423438
};
34433439

34443440
DBUG_ENTER("do_connect");

‎extra/comp_err.c‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -241,7 +241,7 @@ static int create_header_files(struct errors *error_head)
241241
/* generating sql_state.h file */
242242
if (tmp_error->sql_code1[0] || tmp_error->sql_code2[0])
243243
fprintf(sql_statef,
244-
"%-40s,\"%s\", \"%s\",\n", tmp_error->er_name,
244+
"{ %-40s,\"%s\", \"%s\" },\n", tmp_error->er_name,
245245
tmp_error->sql_code1, tmp_error->sql_code2);
246246
/*generating er_name file */
247247
fprintf(er_namef, "{ \"%s\", %d },\n", tmp_error->er_name,

‎mysql-test/r/partition_innodb.result‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -55,6 +55,7 @@ engine = x
5555
partition by key (a);
5656
Warnings:
5757
Warning 1286 Unknown table engine 'x'
58+
Warning 1266 Using storage engine MyISAM for table 't1'
5859
show create table t1;
5960
Table Create Table
6061
t1 CREATE TABLE `t1` (

‎sql/event_queue.cc‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -73,8 +73,8 @@ Event_queue::Event_queue()
7373
:mutex_last_locked_at_line(0), mutex_last_unlocked_at_line(0),
7474
mutex_last_attempted_lock_at_line(0),
7575
mutex_queue_data_locked(FALSE),
76-
mutex_queue_data_attempting_lock(FALSE),
77-
next_activation_at(0)
76+
next_activation_at(0),
77+
mutex_queue_data_attempting_lock(FALSE)
7878
{
7979
mutex_last_unlocked_in_func= mutex_last_locked_in_func=
8080
mutex_last_attempted_lock_in_func= "";

‎sql/ha_partition.cc‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2340,7 +2340,8 @@ int ha_partition::open(const char *name, int mode, uint test_if_locked)
23402340

23412341
handler *ha_partition::clone(MEM_ROOT *mem_root)
23422342
{
2343-
handler *new_handler= get_new_handler(table->s, mem_root, table->s->db_type);
2343+
handler *new_handler= get_new_handler(table->s, mem_root,
2344+
table->s->db_type());
23442345
((ha_partition*)new_handler)->m_part_info= m_part_info;
23452346
((ha_partition*)new_handler)->is_clone= TRUE;
23462347
if (new_handler && !new_handler->ha_open(table,

‎sql/handler.h‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -968,11 +968,12 @@ class handler :public Sql_alloc
968968
Discrete_interval auto_inc_interval_for_cur_row;
969969

970970
handler(handlerton *ht_arg, TABLE_SHARE *share_arg)
971-
:table_share(share_arg), estimation_rows_to_insert(0), ht(ht_arg),
971+
:table_share(share_arg), table(0),
972+
estimation_rows_to_insert(0), ht(ht_arg),
972973
ref(0), key_used_on_scan(MAX_KEY), active_index(MAX_KEY),
973974
ref_length(sizeof(my_off_t)),
974975
ft_handler(0), inited(NONE), implicit_emptied(0),
975-
pushed_cond(NULL), next_insert_id(0), insert_id_for_cur_row(0)
976+
pushed_cond(0), next_insert_id(0), insert_id_for_cur_row(0)
976977
{}
977978
virtual ~handler(void)
978979
{

‎sql/opt_range.cc‎

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1552,8 +1552,8 @@ QUICK_ROR_UNION_SELECT::~QUICK_ROR_UNION_SELECT()
15521552

15531553
QUICK_RANGE::QUICK_RANGE()
15541554
:min_key(0),max_key(0),min_length(0),max_length(0),
1555-
min_keypart_map(0), max_keypart_map(0),
1556-
flag(NO_MIN_RANGE | NO_MAX_RANGE)
1555+
flag(NO_MIN_RANGE | NO_MAX_RANGE),
1556+
min_keypart_map(0), max_keypart_map(0)
15571557
{}
15581558

15591559
SEL_ARG::SEL_ARG(SEL_ARG &arg) :Sql_alloc()
@@ -10008,11 +10008,12 @@ QUICK_GROUP_MIN_MAX_SELECT(TABLE *table, JOIN *join_arg, bool have_min_arg,
1000810008
ha_rows records_arg, uint key_infix_len_arg,
1000910009
byte *key_infix_arg, MEM_ROOT *parent_alloc)
1001010010
:join(join_arg), index_info(index_info_arg),
10011-
group_prefix_len(group_prefix_len_arg), have_min(have_min_arg),
10011+
group_prefix_len(group_prefix_len_arg),
10012+
group_key_parts(group_key_parts_arg), have_min(have_min_arg),
1001210013
have_max(have_max_arg), seen_first_key(FALSE),
1001310014
min_max_arg_part(min_max_arg_part_arg), key_infix(key_infix_arg),
1001410015
key_infix_len(key_infix_len_arg), min_functions_it(NULL),
10015-
max_functions_it(NULL), group_key_parts(group_key_parts_arg)
10016+
max_functions_it(NULL)
1001610017
{
1001710018
head= table;
1001810019
file= head->file;

‎sql/opt_range.h‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -52,9 +52,9 @@ class QUICK_RANGE :public Sql_alloc {
5252
max_key((char*) sql_memdup(max_key_arg,max_length_arg+1)),
5353
min_length((uint16) min_length_arg),
5454
max_length((uint16) max_length_arg),
55+
flag((uint16) flag_arg),
5556
min_keypart_map(min_keypart_map_arg),
56-
max_keypart_map(max_keypart_map_arg),
57-
flag((uint16) flag_arg)
57+
max_keypart_map(max_keypart_map_arg)
5858
{
5959
#ifdef HAVE_purify
6060
dummy=0;

‎sql/rpl_mi.cc‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -29,8 +29,8 @@ int init_strvar_from_file(char *var, int max_size, IO_CACHE *f,
2929

3030
MASTER_INFO::MASTER_INFO()
3131
:ssl(0), fd(-1), io_thd(0), inited(0),
32-
abort_slave(0),slave_running(0), slave_run_id(0),
33-
ssl_verify_server_cert(0)
32+
abort_slave(0),slave_running(0),
33+
ssl_verify_server_cert(0), slave_run_id(0)
3434
{
3535
host[0] = 0; user[0] = 0; password[0] = 0;
3636
ssl_ca[0]= 0; ssl_capath[0]= 0; ssl_cert[0]= 0;

‎sql/set_var.cc‎

Lines changed: 12 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -317,10 +317,10 @@ static sys_var_long_ptr sys_myisam_data_pointer_size(&vars, "myisam_data_pointer
317317
static sys_var_thd_ulonglong sys_myisam_max_sort_file_size(&vars, "myisam_max_sort_file_size", &SV::myisam_max_sort_file_size, fix_myisam_max_sort_file_size, 1);
318318
static sys_var_thd_ulong sys_myisam_repair_threads(&vars, "myisam_repair_threads", &SV::myisam_repair_threads);
319319
static sys_var_thd_ulong sys_myisam_sort_buffer_size(&vars, "myisam_sort_buffer_size", &SV::myisam_sort_buff_size);
320-
static sys_var_bool_ptr sys_myisam_use_mmap(&vars, "myisam_use_mmap",
320+
static sys_var_bool_ptr sys_myisam_use_mmap(&vars, "myisam_use_mmap",
321321
&opt_myisam_use_mmap);
322322

323-
static sys_var_thd_enum sys_myisam_stats_method(&vars, "myisam_stats_method",
323+
static sys_var_thd_enum sys_myisam_stats_method(&vars, "myisam_stats_method",
324324
&SV::myisam_stats_method,
325325
&myisam_stats_method_typelib,
326326
NULL);
@@ -337,16 +337,17 @@ static sys_var_thd_ulong sys_net_retry_count(&vars, "net_retry_count",
337337
&SV::net_retry_count,
338338
0, fix_net_retry_count);
339339
static sys_var_thd_bool sys_new_mode(&vars, "new", &SV::new_mode);
340-
static sys_var_bool_ptr_readonly sys_old_mode(&vars, "old",
340+
static sys_var_bool_ptr_readonly sys_old_mode(&vars, "old",
341341
&global_system_variables.old_mode);
342-
static sys_var_thd_bool sys_old_alter_table(&vars, "old_alter_table",
343-
&SV::old_alter_table);
344-
sys_var_thd_bool sys_old_passwords(&vars, "old_passwords", &SV::old_passwords);
345-
static sys_var_thd_ulong sys_optimizer_prune_level(&vars, "optimizer_prune_level",
342+
/* these two cannot be static */
343+
sys_var_thd_bool sys_old_alter_table(&vars, "old_alter_table",
344+
&SV::old_alter_table);
345+
sys_var_thd_bool sys_old_passwords(&vars, "old_passwords", &SV::old_passwords);
346+
static sys_var_thd_ulong sys_optimizer_prune_level(&vars, "optimizer_prune_level",
346347
&SV::optimizer_prune_level);
347-
static sys_var_thd_ulong sys_optimizer_search_depth(&vars, "optimizer_search_depth",
348+
static sys_var_thd_ulong sys_optimizer_search_depth(&vars, "optimizer_search_depth",
348349
&SV::optimizer_search_depth);
349-
static sys_var_thd_ulong sys_preload_buff_size(&vars, "preload_buffer_size",
350+
static sys_var_thd_ulong sys_preload_buff_size(&vars, "preload_buffer_size",
350351
&SV::preload_buff_size);
351352
static sys_var_thd_ulong sys_read_buff_size(&vars, "read_buffer_size",
352353
&SV::read_buff_size);
@@ -615,7 +616,8 @@ static sys_var_have_variable sys_have_dlopen(&vars, "have_dynamic_loading", &hav
615616
static sys_var_have_variable sys_have_geometry(&vars, "have_geometry", &have_geometry);
616617
static sys_var_have_plugin sys_have_innodb(&vars, "have_innodb", C_STRING_WITH_LEN("innodb"), MYSQL_STORAGE_ENGINE_PLUGIN);
617618
static sys_var_have_plugin sys_have_ndbcluster(&vars, "have_ndbcluster", C_STRING_WITH_LEN("ndbcluster"), MYSQL_STORAGE_ENGINE_PLUGIN);
618-
static sys_var_have_variable sys_have_openssl(&vars, "have_openssl", &have_openssl);
619+
static sys_var_have_variable sys_have_openssl(&vars, "have_openssl", &have_ssl);
620+
static sys_var_have_variable sys_have_ssl(&vars, "have_ssl", &have_ssl);
619621
static sys_var_have_plugin sys_have_partition_db(&vars, "have_partitioning", C_STRING_WITH_LEN("partition"), MYSQL_STORAGE_ENGINE_PLUGIN);
620622
static sys_var_have_variable sys_have_query_cache(&vars, "have_query_cache",
621623
&have_query_cache);

0 commit comments

Comments
 (0)