diff options
| author | unknown <jani@rhols221.adsl.netsonic.fi> | 2002-10-15 23:34:55 +0300 |
|---|---|---|
| committer | unknown <jani@rhols221.adsl.netsonic.fi> | 2002-10-15 23:34:55 +0300 |
| commit | d3c61fd93e7518301e881760fba8a956eed3d38a (patch) | |
| tree | 6917f9259c42d8c8875bf909cb8360dfb26842e9 /client | |
| parent | 2c5aae462a4038f0e3d7dc200128f5d876c59a13 (diff) | |
| download | mariadb-git-d3c61fd93e7518301e881760fba8a956eed3d38a.tar.gz | |
Fixed some bugs in mysql, mysqladmin and mysqld.
client/mysql.cc:
Fixed a bug in --pager when used with --disable- or --skip- prefixes.
client/mysqladmin.c:
Fixed a bug in --wait, which didn't take an optional argument while it should.
sql/mysqld.cc:
Fixed a type and a bug in --transaction-isolation option in mysqld.cc
Diffstat (limited to 'client')
| -rw-r--r-- | client/mysql.cc | 17 | ||||
| -rw-r--r-- | client/mysqladmin.c | 6 |
2 files changed, 14 insertions, 9 deletions
diff --git a/client/mysql.cc b/client/mysql.cc index 70b5561a7ea..330665dde2a 100644 --- a/client/mysql.cc +++ b/client/mysql.cc @@ -40,7 +40,7 @@ #include <signal.h> #include <violite.h> -const char *VER= "12.15"; +const char *VER= "12.16"; /* Don't try to make a nice table if the data is too big */ #define MAX_COLUMN_LENGTH 1024 @@ -627,12 +627,17 @@ get_one_option(int optid, const struct my_option *opt __attribute__((unused)), end_tee(); break; case OPT_PAGER: - opt_nopager= 0; - if (argument) - strmov(pager, argument); + if (argument == disabled_my_option) + opt_nopager= 1; else - strmov(pager, default_pager); - strmov(default_pager, pager); + { + opt_nopager= 0; + if (argument) + strmov(pager, argument); + else + strmov(pager, default_pager); + strmov(default_pager, pager); + } break; case OPT_NOPAGER: printf("WARNING: option deprecated; use --disable-pager instead.\n"); diff --git a/client/mysqladmin.c b/client/mysqladmin.c index 01e36509c30..00af8c592ec 100644 --- a/client/mysqladmin.c +++ b/client/mysqladmin.c @@ -24,7 +24,7 @@ #endif #include <sys/stat.h> -#define ADMIN_VERSION "8.37" +#define ADMIN_VERSION "8.38" #define MAX_MYSQL_VAR 128 #define SHUTDOWN_DEF_TIMEOUT 3600 /* Wait for shutdown */ #define MAX_TRUNC_LENGTH 3 @@ -163,8 +163,8 @@ static struct my_option my_long_options[] = "Print output vertically. Is similar to --relative, but prints output vertically.", (gptr*) &opt_vertical, (gptr*) &opt_vertical, 0, GET_BOOL, NO_ARG, 0, 0, 0, 0, 0, 0}, - {"wait", 'w', "Wait and retry if connection is down", 0, 0, 0, GET_NO_ARG, - NO_ARG, 0, 0, 0, 0, 0, 0}, + {"wait", 'w', "Wait and retry if connection is down", 0, 0, 0, GET_UINT, + OPT_ARG, 0, 0, 0, 0, 0, 0}, {"connect_timeout", OPT_CONNECT_TIMEOUT, "", (gptr*) &opt_connect_timeout, (gptr*) &opt_connect_timeout, 0, GET_ULONG, REQUIRED_ARG, 3600*12, 0, 3600*12, 0, 1, 0}, |