Merge branch 'mysql-8.0-bug26576922' into mysql-trunk-bug26576922

Author: Tatiana Azundris Nuernberg

mysql-test/r/log_options_cmdline.result

@@ -21,6 +21,9 @@ DROP TABLE t1;
 # restart: --log-error=LOG_FILE8 --lc-messages-dir=MSG_DIR --log-error-verbosity=3
 connect(localhost,unknown_user,,,MASTER_PORT,MASTER_SOCKET);
 ERROR 28000: Access denied for user 'unknown_user'@'localhost' (using password: NO)
+# restart: --log-error=LOG_FILE8B --lc-messages=invalid_arg1 --lc-time-names=invalid_arg2
+connect(localhost,unknown_user,,,MASTER_PORT,MASTER_SOCKET);
+ERROR 28000: Access denied for user 'unknown_user'@'localhost' (using password: NO)
 # restart: --log-error=LOG_FILE9 --log-error-services=abcd 
 SELECT @@GLOBAL.LOG_ERROR_SERVICES;
 @@GLOBAL.LOG_ERROR_SERVICES

mysql-test/t/log_options_cmdline.test

@@ -103,7 +103,7 @@ DROP TABLE t1;
 
 # 3.1. Test giving an empty lc-messages-dir and verify that the
 #      server makes use of builtin english messages when the
-#      language files(errmsg.sys) are not found
+#      language files (errmsg.sys) are not found
 #--------------------------------------------------------------
 --let LOG_FILE8 = $MYSQLTEST_VARDIR/tmp/wl9344.err
 --let $MSG_DIR = $MYSQLTEST_VARDIR/tmp/empty_lcmsgsdir
@@ -117,6 +117,25 @@ connect(con4,localhost,unknown_user,,*NO-ONE*);
 --rmdir $MSG_DIR
 
 
+# Related:
+#
+# Bug#26576922: SERVER DOESN'T ALWAYS FALL BACK TO DEFAULT ERROR MESSAGES
+#
+#      Test giving an empty lc-messages and verify that the
+#      server makes use of builtin english messages when the
+#      language files (errmsg.sys) are not found
+#--------------------------------------------------------------
+--let LOG_FILE8B = $MYSQLTEST_VARDIR/tmp/bug26576922.err
+--mkdir $MSG_DIR
+--let restart_parameters="restart: --log-error=$LOG_FILE8B --lc-messages=invalid_arg1 --lc-time-names=invalid_arg2"
+--replace_result $LOG_FILE8B LOG_FILE8B $MSG_DIR MSG_DIR
+--source include/restart_mysqld.inc
+--replace_result $MASTER_MYSOCK MASTER_SOCKET $MASTER_MYPORT MASTER_PORT
+--error ER_ACCESS_DENIED_ERROR
+connect(con4,localhost,unknown_user,,*NO-ONE*);
+--rmdir $MSG_DIR
+
+
 ##================================================================##
 # 4 - WL#9323:  Logging services: Improved Error logging in 8.0    #
 ##================================================================##
@@ -437,6 +456,7 @@ EOF
 --remove_file $LOG_FILE5
 --remove_file $LOG_FILE7
 --remove_file $LOG_FILE8
+--remove_file $LOG_FILE8B
 --remove_file $LOG_FILE9
 --remove_file $LOG_FILE10
 --remove_file $LOG_FILE11

sql/mysqld.cc

@@ -595,7 +595,8 @@ using std::min;
 using std::max;
 using std::vector;
 
-#define mysqld_charset &my_charset_latin1
+#define mysqld_charset              &my_charset_latin1
+#define mysqld_default_locale_name  "en_US"
 
 #if defined(HAVE_SOLARIS_LARGE_PAGES) && defined(__GNUC__)
 extern "C" int getpagesizes(size_t *, int);
@@ -3596,12 +3597,15 @@ int init_common_variables()
   if (back_log == 0 && (back_log= max_connections) > 65535)
     back_log= 65535;
 
-  unireg_init(opt_specialflag); /* Set up extern variabels */
-  if (!(my_default_lc_messages=
-        my_locale_by_name(NULL, lc_messages)))
+  unireg_init(opt_specialflag); /* Set up extern variables */
+  while (!(my_default_lc_messages=
+           my_locale_by_name(NULL, lc_messages)))
   {
     LogErr(ERROR_LEVEL, ER_UNKNOWN_LOCALE, lc_messages);
-    return 1;
+    if (!my_strcasecmp(&my_charset_latin1,
+                       lc_messages, mysqld_default_locale_name))
+      return 1;
+    lc_messages= (char*) mysqld_default_locale_name;
   }
   global_system_variables.lc_messages= my_default_lc_messages;
   if (init_errmessage())  /* Read error messages from file */
@@ -3688,11 +3692,14 @@ int init_common_variables()
     return 1;
   }
 
-  if (!(my_default_lc_time_names=
-        my_locale_by_name(NULL, lc_time_names_name)))
+  while (!(my_default_lc_time_names=
+           my_locale_by_name(NULL, lc_time_names_name)))
   {
     LogErr(ERROR_LEVEL, ER_UNKNOWN_LOCALE, lc_time_names_name);
-    return 1;
+    if (!my_strcasecmp(&my_charset_latin1,
+                       lc_time_names_name, mysqld_default_locale_name))
+      return 1;
+    lc_time_names_name= (char*) mysqld_default_locale_name;
   }
   global_system_variables.lc_time_names= my_default_lc_time_names;
 
@@ -8113,14 +8120,14 @@ static int mysql_init_variables()
   log_bin_index= NULL;
 
   /* Handler variables */
-  total_ha_2pc= 0;
+  total_ha_2pc=                  0;
   /* Variables in libraries */
-  charsets_dir= 0;
-  default_character_set_name= (char*) MYSQL_DEFAULT_CHARSET_NAME;
-  default_collation_name= compiled_default_collation_name;
+  charsets_dir=                  0;
+  default_character_set_name=    (char*) MYSQL_DEFAULT_CHARSET_NAME;
+  default_collation_name=        compiled_default_collation_name;
   character_set_filesystem_name= (char*) "binary";
-  lc_messages= (char*) "en_US";
-  lc_time_names_name= (char*) "en_US";
+  lc_messages=                   (char*) mysqld_default_locale_name;
+  lc_time_names_name=            (char*) mysqld_default_locale_name;
 
   /* Variables that depends on compile options */
 #ifndef DBUG_OFF