Commit 6277365f authored by unknown's avatar unknown
Browse files

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

into  mysql.com:/home/bar/mysql-5.1-new-rpl


sql/mysqld.cc:
  Auto merged
parents 60e587bd 1992907b

sql/mysqld.cc

+1 −1
Original line number Diff line number Diff line
@@ -2919,7 +2919,7 @@ static int init_common_variables(const char *conf_file_name, int argc, 
  if (!(my_default_lc_time_names=

        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;

  }

  global_system_variables.lc_time_names= my_default_lc_time_names;