From d3c61fd93e7518301e881760fba8a956eed3d38a Mon Sep 17 00:00:00 2001 From: unknown Date: Tue, 15 Oct 2002 23:34:55 +0300 Subject: [PATCH] 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 +++++++++++------ client/mysqladmin.c | 6 +++--- sql/mysqld.cc | 7 +++---- 3 files changed, 17 insertions(+), 13 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 #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"); 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 -#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}, diff --git a/sql/mysqld.cc b/sql/mysqld.cc index c418ef34174..9fe48429694 100644 --- a/sql/mysqld.cc +++ b/sql/mysqld.cc @@ -3319,9 +3319,8 @@ struct my_option my_long_options[] = {"tmpdir", 't', "Path for temporary files", (gptr*) &opt_mysql_tmpdir, (gptr*) &opt_mysql_tmpdir, 0, GET_STR, REQUIRED_ARG, 0, 0, 0, 0, 0, 0}, {"transaction-isolation", OPT_TX_ISOLATION, - "Default transaction isolation level", 0, 0, 0, GET_NO_ARG, REQUIRED_ARG, 0, - 0, 0, 0, - 0, 0}, + "Default transaction isolation level", 0, 0, 0, GET_STR, REQUIRED_ARG, 0, + 0, 0, 0, 0, 0}, {"external-locking", OPT_USE_LOCKING, "Use system (external) locking. With this option enabled you can run myisamchk to test (not repair) tables while the MySQL server is running", (gptr*) &opt_external_locking, (gptr*) &opt_external_locking, 0, GET_BOOL, NO_ARG, 0, 0, 0, 0, 0, 0}, @@ -3374,7 +3373,7 @@ struct my_option my_long_options[] = (gptr*) &connect_timeout, (gptr*) &connect_timeout, 0, GET_ULONG, REQUIRED_ARG, CONNECT_TIMEOUT, 2, LONG_TIMEOUT, 0, 1, 0 }, {"delayed_insert_timeout", OPT_DELAYED_INSERT_TIMEOUT, - "Ho wlong a INSERT DELAYED thread should wait for INSERT statements before terminating.", + "How long a INSERT DELAYED thread should wait for INSERT statements before terminating.", (gptr*) &delayed_insert_timeout, (gptr*) &delayed_insert_timeout, 0, GET_ULONG, REQUIRED_ARG, DELAYED_WAIT_TIMEOUT, 1, LONG_TIMEOUT, 0, 1, 0}, {"delayed_insert_limit", OPT_DELAYED_INSERT_LIMIT,