Commit b4284d0e authored by bar@bar.myoffice.izhnet.ru's avatar bar@bar.myoffice.izhnet.ru

Merge mysql.com:/home/bar/mysql-5.0-rpl

into  mysql.com:/home/bar/mysql-5.1-new-rpl
parents 48b2d857 e0cc5fd0
...@@ -2919,7 +2919,7 @@ static int init_common_variables(const char *conf_file_name, int argc, ...@@ -2919,7 +2919,7 @@ static int init_common_variables(const char *conf_file_name, int argc,
if (!(my_default_lc_time_names= if (!(my_default_lc_time_names=
my_locale_by_name(lc_time_names_name))) my_locale_by_name(lc_time_names_name)))
{ {
sql_print_error("Unknown locale: '%s'", MYF(0), lc_time_names_name); sql_print_error("Unknown locale: '%s'", lc_time_names_name);
return 1; return 1;
} }
global_system_variables.lc_time_names= my_default_lc_time_names; global_system_variables.lc_time_names= my_default_lc_time_names;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment