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/mysql.cc | |
| 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/mysql.cc')
| -rw-r--r-- | client/mysql.cc | 17 |
1 files changed, 11 insertions, 6 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"); |