Merge work:/home/bk/mysql into hundin.mysql.fi:/my/bk/mysql

This commit is contained in:
monty@hundin.mysql.fi 2002-10-08 16:41:50 +03:00
commit 8af1c6f354
2 changed files with 2 additions and 1 deletions

View file

@ -46929,6 +46929,8 @@ not yet 100% confident in this code.
@appendixsubsec Changes in release 3.23.53 @appendixsubsec Changes in release 3.23.53
@itemize @bullet @itemize @bullet
@item @item
Fixed that @code{--skip-show-databases} doesn't reset the @code{--port} option.
@item
Small fix in @code{safe_mysqld} for some shells. Small fix in @code{safe_mysqld} for some shells.
@item @item
Fixed that @code{SHOW STATUS} doesn't reset @code{Delayed_insert_threads}. Fixed that @code{SHOW STATUS} doesn't reset @code{Delayed_insert_threads}.

View file

@ -3807,7 +3807,6 @@ static void get_options(int argc,char **argv)
case (int) OPT_SKIP_SHOW_DB: case (int) OPT_SKIP_SHOW_DB:
opt_skip_show_db=1; opt_skip_show_db=1;
opt_specialflag|=SPECIAL_SKIP_SHOW_DB; opt_specialflag|=SPECIAL_SKIP_SHOW_DB;
mysql_port=0;
break; break;
case (int) OPT_MEMLOCK: case (int) OPT_MEMLOCK:
locked_in_memory=1; locked_in_memory=1;