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 /sql/mysqld.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 'sql/mysqld.cc')
| -rw-r--r-- | sql/mysqld.cc | 7 |
1 files changed, 3 insertions, 4 deletions
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, |