Fixed some bugs in mysql, mysqladmin and mysqld.

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");

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},

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,