diff options
| author | unknown <monty@mashka.mysql.fi> | 2002-09-22 10:35:15 +0300 |
|---|---|---|
| committer | unknown <monty@mashka.mysql.fi> | 2002-09-22 10:35:15 +0300 |
| commit | 0ef398632c68e5a7aa5e72a5ebc154d965128834 (patch) | |
| tree | 87e7f602b563d9a1ad9076e0470e9668a28469d5 /client | |
| parent | 55e5a6b815af5188da0777233dc822ba176fda4f (diff) | |
| download | mariadb-git-0ef398632c68e5a7aa5e72a5ebc154d965128834.tar.gz | |
Fixed bug in previous patch when using a libc with static nss
client/mysql.cc:
Fixed help text
mysql-test/t/rpl_rotate_logs.test:
Updated test
sql/sql_acl.cc:
comments and safety checks
Diffstat (limited to 'client')
| -rw-r--r-- | client/mysql.cc | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/client/mysql.cc b/client/mysql.cc index 33cbcbd2f6b..7d9ecda12e3 100644 --- a/client/mysql.cc +++ b/client/mysql.cc @@ -40,7 +40,7 @@ #include <signal.h> #include <violite.h> -const char *VER= "12.13"; +const char *VER= "12.14"; /* Don't try to make a nice table if the data is too big */ #define MAX_COLUMN_LENGTH 1024 @@ -476,7 +476,8 @@ static struct my_option my_long_options[] = {"ignore-space", 'i', "Ignore space after function names.", 0, 0, 0, GET_NO_ARG, NO_ARG, 0, 0, 0, 0, 0, 0}, {"local-infile", OPT_LOCAL_INFILE, "Enable/disable LOAD DATA LOCAL INFILE.", - 0, 0, 0, GET_STR, OPT_ARG, 0, 0, 0, 0, 0, 0}, + (gptr*) &opt_local_infile, + (gptr*) &opt_local_infile, 0, GET_BOOL, OPT_ARG, 0, 0, 0, 0, 0, 0}, {"no-beep", 'b', "Turn off beep on error.", (gptr*) &opt_nobeep, (gptr*) &opt_nobeep, 0, GET_BOOL, NO_ARG, 0, 0, 0, 0, 0, 0}, {"host", 'h', "Connect to host.", (gptr*) ¤t_host, @@ -609,7 +610,6 @@ get_one_option(int optid, const struct my_option *opt __attribute__((unused)), break; case OPT_LOCAL_INFILE: using_opt_local_infile=1; - opt_local_infile= test(!argument || atoi(argument)>0); break; case OPT_TEE: if (argument == disabled_my_option) |