From d3c61fd93e7518301e881760fba8a956eed3d38a Mon Sep 17 00:00:00 2001 From: unknown Date: Tue, 15 Oct 2002 23:34:55 +0300 Subject: 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 --- client/mysql.cc | 17 +++++++++++------ 1 file changed, 11 insertions(+), 6 deletions(-) (limited to 'client/mysql.cc') 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 #include -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"); -- cgit v1.2.1