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

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

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;