mirror of
https://github.com/MariaDB/server.git
synced 2025-08-07 00:04:31 +03:00
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
This commit is contained in:
@@ -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");
|
||||
|
Reference in New Issue
Block a user