diff options
| author | unknown <monty@hundin.mysql.fi> | 2002-10-08 16:41:50 +0300 |
|---|---|---|
| committer | unknown <monty@hundin.mysql.fi> | 2002-10-08 16:41:50 +0300 |
| commit | 97a120e16bd929839a24ece52117f2220ad5a358 (patch) | |
| tree | 8f581be8308dcf0db8317f71576f7f56f4944619 | |
| parent | 122b6927bf6482aa4ffa8bfec9ab3a59542fe633 (diff) | |
| parent | 9d33a7a2e4ce6e18589db27285ac984d757a00c8 (diff) | |
| download | mariadb-git-97a120e16bd929839a24ece52117f2220ad5a358.tar.gz | |
Merge work:/home/bk/mysql into hundin.mysql.fi:/my/bk/mysql
| -rw-r--r-- | Docs/manual.texi | 2 | ||||
| -rw-r--r-- | sql/mysqld.cc | 1 |
2 files changed, 2 insertions, 1 deletions
diff --git a/Docs/manual.texi b/Docs/manual.texi index 001df660773..907ab1de62c 100644 --- a/Docs/manual.texi +++ b/Docs/manual.texi @@ -46929,6 +46929,8 @@ not yet 100% confident in this code. @appendixsubsec Changes in release 3.23.53 @itemize @bullet @item +Fixed that @code{--skip-show-databases} doesn't reset the @code{--port} option. +@item Small fix in @code{safe_mysqld} for some shells. @item Fixed that @code{SHOW STATUS} doesn't reset @code{Delayed_insert_threads}. diff --git a/sql/mysqld.cc b/sql/mysqld.cc index b5c789548e7..2edde0ed684 100644 --- a/sql/mysqld.cc +++ b/sql/mysqld.cc @@ -3807,7 +3807,6 @@ static void get_options(int argc,char **argv) case (int) OPT_SKIP_SHOW_DB: opt_skip_show_db=1; opt_specialflag|=SPECIAL_SKIP_SHOW_DB; - mysql_port=0; break; case (int) OPT_MEMLOCK: locked_in_memory=1; |