Skip to content

Commit 695225f

Browse files
gkodinovgkodinov
committed
merge mysql-5.5->mysql-trunk
2 parents 9d55296 + af78e87 commit 695225f

14 files changed

Lines changed: 34 additions & 33 deletions

‎client/mysql.cc‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1640,11 +1640,11 @@ static struct my_option my_long_options[] =
16401640
&show_warnings, &show_warnings, 0, GET_BOOL, NO_ARG,
16411641
0, 0, 0, 0, 0, 0},
16421642
{"plugin_dir", OPT_PLUGIN_DIR, "Directory for client-side plugins.",
1643-
(uchar**) &opt_plugin_dir, (uchar**) &opt_plugin_dir, 0,
1643+
&opt_plugin_dir, &opt_plugin_dir, 0,
16441644
GET_STR, REQUIRED_ARG, 0, 0, 0, 0, 0, 0},
16451645
{"default_auth", OPT_DEFAULT_AUTH,
16461646
"Default authentication client-side plugin to use.",
1647-
(uchar**) &opt_default_auth, (uchar**) &opt_default_auth, 0,
1647+
&opt_default_auth, &opt_default_auth, 0,
16481648
GET_STR, REQUIRED_ARG, 0, 0, 0, 0, 0, 0},
16491649
{ 0, 0, 0, 0, 0, 0, GET_NO_ARG, NO_ARG, 0, 0, 0, 0, 0, 0}
16501650
};

‎client/mysql_upgrade.c‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -92,7 +92,7 @@ static struct my_option my_long_options[]=
9292
0, 0, GET_STR, REQUIRED_ARG, 0, 0, 0, 0, 0, 0},
9393
{"default_auth", OPT_DEFAULT_AUTH,
9494
"Default authentication client-side plugin to use.",
95-
(uchar**) &opt_default_auth, (uchar**) &opt_default_auth, 0,
95+
&opt_default_auth, &opt_default_auth, 0,
9696
GET_STR, REQUIRED_ARG, 0, 0, 0, 0, 0, 0},
9797
{"force", 'f', "Force execution of mysqlcheck even if mysql_upgrade "
9898
"has already been executed for the current version of MySQL.",
@@ -109,7 +109,7 @@ static struct my_option my_long_options[]=
109109
GET_NO_ARG, NO_ARG, 0, 0, 0, 0, 0, 0},
110110
#endif
111111
{"plugin_dir", OPT_PLUGIN_DIR, "Directory for client-side plugins.",
112-
(uchar**) &opt_plugin_dir, (uchar**) &opt_plugin_dir, 0,
112+
&opt_plugin_dir, &opt_plugin_dir, 0,
113113
GET_STR, REQUIRED_ARG, 0, 0, 0, 0, 0, 0},
114114
{"port", 'P', "Port number to use for connection or 0 for default to, in "
115115
"order of preference, my.cnf, $MYSQL_TCP_PORT, "

‎client/mysqladmin.cc‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -210,11 +210,11 @@ static struct my_option my_long_options[] =
210210
&opt_shutdown_timeout, 0, GET_ULONG, REQUIRED_ARG,
211211
SHUTDOWN_DEF_TIMEOUT, 0, 3600*12, 0, 1, 0},
212212
{"plugin_dir", OPT_PLUGIN_DIR, "Directory for client-side plugins.",
213-
(uchar**) &opt_plugin_dir, (uchar**) &opt_plugin_dir, 0,
213+
&opt_plugin_dir, &opt_plugin_dir, 0,
214214
GET_STR, REQUIRED_ARG, 0, 0, 0, 0, 0, 0},
215215
{"default_auth", OPT_DEFAULT_AUTH,
216216
"Default authentication client-side plugin to use.",
217-
(uchar**) &opt_default_auth, (uchar**) &opt_default_auth, 0,
217+
&opt_default_auth, &opt_default_auth, 0,
218218
GET_STR, REQUIRED_ARG, 0, 0, 0, 0, 0, 0},
219219
{ 0, 0, 0, 0, 0, 0, GET_NO_ARG, NO_ARG, 0, 0, 0, 0, 0, 0}
220220
};

‎client/mysqlbinlog.cc‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1037,7 +1037,7 @@ static struct my_option my_long_options[] =
10371037
0, GET_BOOL, NO_ARG, 0, 0, 0, 0, 0, 0},
10381038
{"default_auth", OPT_DEFAULT_AUTH,
10391039
"Default authentication client-side plugin to use.",
1040-
(uchar**) &opt_default_auth, (uchar**) &opt_default_auth, 0,
1040+
&opt_default_auth, &opt_default_auth, 0,
10411041
GET_STR, REQUIRED_ARG, 0, 0, 0, 0, 0, 0},
10421042
{"disable-log-bin", 'D', "Disable binary log. This is useful, if you "
10431043
"enabled --to-last-log and are sending the output to the same MySQL server. "
@@ -1065,7 +1065,7 @@ static struct my_option my_long_options[] =
10651065
{"password", 'p', "Password to connect to remote server.",
10661066
0, 0, 0, GET_STR, OPT_ARG, 0, 0, 0, 0, 0, 0},
10671067
{"plugin_dir", OPT_PLUGIN_DIR, "Directory for client-side plugins.",
1068-
(uchar**) &opt_plugin_dir, (uchar**) &opt_plugin_dir, 0,
1068+
&opt_plugin_dir, &opt_plugin_dir, 0,
10691069
GET_STR, REQUIRED_ARG, 0, 0, 0, 0, 0, 0},
10701070
{"port", 'P', "Port number to use for connection or 0 for default to, in "
10711071
"order of preference, my.cnf, $MYSQL_TCP_PORT, "

‎client/mysqlcheck.c‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -106,7 +106,7 @@ static struct my_option my_long_options[] =
106106
&default_charset, 0, GET_STR, REQUIRED_ARG, 0, 0, 0, 0, 0, 0},
107107
{"default_auth", OPT_DEFAULT_AUTH,
108108
"Default authentication client-side plugin to use.",
109-
(uchar**) &opt_default_auth, (uchar**) &opt_default_auth, 0,
109+
&opt_default_auth, &opt_default_auth, 0,
110110
GET_STR, REQUIRED_ARG, 0, 0, 0, 0, 0, 0},
111111
{"fast",'F', "Check only tables that haven't been closed properly.",
112112
&opt_fast, &opt_fast, 0, GET_BOOL, NO_ARG, 0, 0, 0, 0, 0,
@@ -146,7 +146,7 @@ static struct my_option my_long_options[] =
146146
NO_ARG, 0, 0, 0, 0, 0, 0},
147147
#endif
148148
{"plugin_dir", OPT_PLUGIN_DIR, "Directory for client-side plugins.",
149-
(uchar**) &opt_plugin_dir, (uchar**) &opt_plugin_dir, 0,
149+
&opt_plugin_dir, &opt_plugin_dir, 0,
150150
GET_STR, REQUIRED_ARG, 0, 0, 0, 0, 0, 0},
151151
{"port", 'P', "Port number to use for connection or 0 for default to, in "
152152
"order of preference, my.cnf, $MYSQL_TCP_PORT, "

‎client/mysqldump.c‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -508,11 +508,11 @@ static struct my_option my_long_options[] =
508508
{"xml", 'X', "Dump a database as well formed XML.", 0, 0, 0, GET_NO_ARG,
509509
NO_ARG, 0, 0, 0, 0, 0, 0},
510510
{"plugin_dir", OPT_PLUGIN_DIR, "Directory for client-side plugins.",
511-
(uchar**) &opt_plugin_dir, (uchar**) &opt_plugin_dir, 0,
511+
&opt_plugin_dir, &opt_plugin_dir, 0,
512512
GET_STR, REQUIRED_ARG, 0, 0, 0, 0, 0, 0},
513513
{"default_auth", OPT_DEFAULT_AUTH,
514514
"Default authentication client-side plugin to use.",
515-
(uchar**) &opt_default_auth, (uchar**) &opt_default_auth, 0,
515+
&opt_default_auth, &opt_default_auth, 0,
516516
GET_STR, REQUIRED_ARG, 0, 0, 0, 0, 0, 0},
517517
{0, 0, 0, 0, 0, 0, GET_NO_ARG, NO_ARG, 0, 0, 0, 0, 0, 0}
518518
};

‎client/mysqlimport.c‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -97,7 +97,7 @@ static struct my_option my_long_options[] =
9797
0, GET_BOOL, NO_ARG, 0, 0, 0, 0, 0, 0},
9898
{"default_auth", OPT_DEFAULT_AUTH,
9999
"Default authentication client-side plugin to use.",
100-
(uchar**) &opt_default_auth, (uchar**) &opt_default_auth, 0,
100+
&opt_default_auth, &opt_default_auth, 0,
101101
GET_STR, REQUIRED_ARG, 0, 0, 0, 0, 0, 0},
102102
{"delete", 'd', "First delete all rows from table.", &opt_delete,
103103
&opt_delete, 0, GET_BOOL, NO_ARG, 0, 0, 0, 0, 0, 0},
@@ -149,7 +149,7 @@ static struct my_option my_long_options[] =
149149
NO_ARG, 0, 0, 0, 0, 0, 0},
150150
#endif
151151
{"plugin_dir", OPT_PLUGIN_DIR, "Directory for client-side plugins.",
152-
(uchar**) &opt_plugin_dir, (uchar**) &opt_plugin_dir, 0,
152+
&opt_plugin_dir, &opt_plugin_dir, 0,
153153
GET_STR, REQUIRED_ARG, 0, 0, 0, 0, 0, 0},
154154
{"port", 'P', "Port number to use for connection or 0 for default to, in "
155155
"order of preference, my.cnf, $MYSQL_TCP_PORT, "

‎client/mysqlshow.c‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -197,7 +197,7 @@ static struct my_option my_long_options[] =
197197
0, GET_BOOL, NO_ARG, 0, 0, 0, 0, 0, 0},
198198
{"default_auth", OPT_DEFAULT_AUTH,
199199
"Default authentication client-side plugin to use.",
200-
(uchar**) &opt_default_auth, (uchar**) &opt_default_auth, 0,
200+
&opt_default_auth, &opt_default_auth, 0,
201201
GET_STR, REQUIRED_ARG, 0, 0, 0, 0, 0, 0},
202202
{"help", '?', "Display this help and exit.", 0, 0, 0, GET_NO_ARG, NO_ARG,
203203
0, 0, 0, 0, 0, 0},
@@ -213,7 +213,7 @@ static struct my_option my_long_options[] =
213213
"solicited on the tty.",
214214
0, 0, 0, GET_STR, OPT_ARG, 0, 0, 0, 0, 0, 0},
215215
{"plugin_dir", OPT_PLUGIN_DIR, "Directory for client-side plugins.",
216-
(uchar**) &opt_plugin_dir, (uchar**) &opt_plugin_dir, 0,
216+
&opt_plugin_dir, &opt_plugin_dir, 0,
217217
GET_STR, REQUIRED_ARG, 0, 0, 0, 0, 0, 0},
218218
{"port", 'P', "Port number to use for connection or 0 for default to, in "
219219
"order of preference, my.cnf, $MYSQL_TCP_PORT, "

‎client/mysqlslap.c‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -592,7 +592,7 @@ static struct my_option my_long_options[] =
592592
&debug_info_flag, 0, GET_BOOL, NO_ARG, 0, 0, 0, 0, 0, 0},
593593
{"default_auth", OPT_DEFAULT_AUTH,
594594
"Default authentication client-side plugin to use.",
595-
(uchar**) &opt_default_auth, (uchar**) &opt_default_auth, 0,
595+
&opt_default_auth, &opt_default_auth, 0,
596596
GET_STR, REQUIRED_ARG, 0, 0, 0, 0, 0, 0},
597597
{"delimiter", 'F',
598598
"Delimiter to use in SQL statements supplied in file or command line.",
@@ -636,7 +636,7 @@ static struct my_option my_long_options[] =
636636
NO_ARG, 0, 0, 0, 0, 0, 0},
637637
#endif
638638
{"plugin_dir", OPT_PLUGIN_DIR, "Directory for client-side plugins.",
639-
(uchar**) &opt_plugin_dir, (uchar**) &opt_plugin_dir, 0,
639+
&opt_plugin_dir, &opt_plugin_dir, 0,
640640
GET_STR, REQUIRED_ARG, 0, 0, 0, 0, 0, 0},
641641
{"port", 'P', "Port number to use for connection.", &opt_mysql_port,
642642
&opt_mysql_port, 0, GET_UINT, REQUIRED_ARG, MYSQL_PORT, 0, 0, 0, 0,

‎client/mysqltest.cc‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6399,7 +6399,7 @@ static struct my_option my_long_options[] =
63996399
&opt_connect_timeout, &opt_connect_timeout, 0, GET_UINT, REQUIRED_ARG,
64006400
120, 0, 3600 * 12, 0, 0, 0},
64016401
{"plugin_dir", OPT_PLUGIN_DIR, "Directory for client-side plugins.",
6402-
(uchar**) &opt_plugin_dir, (uchar**) &opt_plugin_dir, 0,
6402+
&opt_plugin_dir, &opt_plugin_dir, 0,
64036403
GET_STR, REQUIRED_ARG, 0, 0, 0, 0, 0, 0},
64046404
{ 0, 0, 0, 0, 0, 0, GET_NO_ARG, NO_ARG, 0, 0, 0, 0, 0, 0}
64056405
};

0 commit comments

Comments
 (0)