diff options
| author | Georgi Kodinov <Georgi.Kodinov@Oracle.com> | 2011-06-06 13:27:05 +0300 |
|---|---|---|
| committer | Georgi Kodinov <Georgi.Kodinov@Oracle.com> | 2011-06-06 13:27:05 +0300 |
| commit | 8d7361f803fb63a90db25f04e4615904bdae3d2c (patch) | |
| tree | f80a8d59e73e10503ad4a34b6a4cc7ee6e7782e4 /client/mysql_upgrade.c | |
| parent | bd708b42400ff2ca8ba22accc696acd3539d9859 (diff) | |
| download | mariadb-git-8d7361f803fb63a90db25f04e4615904bdae3d2c.tar.gz | |
Fixed cast warnings in introducing the pluggable authentication client
options.
Diffstat (limited to 'client/mysql_upgrade.c')
| -rw-r--r-- | client/mysql_upgrade.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/client/mysql_upgrade.c b/client/mysql_upgrade.c index b364acd5e61..2f8c108f15a 100644 --- a/client/mysql_upgrade.c +++ b/client/mysql_upgrade.c @@ -92,7 +92,7 @@ static struct my_option my_long_options[]= 0, 0, GET_STR, REQUIRED_ARG, 0, 0, 0, 0, 0, 0}, {"default_auth", OPT_DEFAULT_AUTH, "Default authentication client-side plugin to use.", - (uchar**) &opt_default_auth, (uchar**) &opt_default_auth, 0, + &opt_default_auth, &opt_default_auth, 0, GET_STR, REQUIRED_ARG, 0, 0, 0, 0, 0, 0}, {"force", 'f', "Force execution of mysqlcheck even if mysql_upgrade " "has already been executed for the current version of MySQL.", @@ -109,7 +109,7 @@ static struct my_option my_long_options[]= GET_NO_ARG, NO_ARG, 0, 0, 0, 0, 0, 0}, #endif {"plugin_dir", OPT_PLUGIN_DIR, "Directory for client-side plugins.", - (uchar**) &opt_plugin_dir, (uchar**) &opt_plugin_dir, 0, + &opt_plugin_dir, &opt_plugin_dir, 0, GET_STR, REQUIRED_ARG, 0, 0, 0, 0, 0, 0}, {"port", 'P', "Port number to use for connection or 0 for default to, in " "order of preference, my.cnf, $MYSQL_TCP_PORT, " |