diff options
| author | unknown <bar@bar.myoffice.izhnet.ru> | 2007-04-12 11:31:59 +0500 |
|---|---|---|
| committer | unknown <bar@bar.myoffice.izhnet.ru> | 2007-04-12 11:31:59 +0500 |
| commit | 6277365ff2a47945e55ecc9ec833767be2e718e5 (patch) | |
| tree | 714cb5c4c227f330a7c84eb917611c57e724ffdf /sql/mysqld.cc | |
| parent | 60e587bd2881e7bbc8462d8c7c057232a57fb67e (diff) | |
| parent | 1992907b451e17078410d32f9218503de7b4972d (diff) | |
| download | mariadb-git-6277365ff2a47945e55ecc9ec833767be2e718e5.tar.gz | |
Merge mysql.com:/home/bar/mysql-5.0-rpl
into mysql.com:/home/bar/mysql-5.1-new-rpl
sql/mysqld.cc:
Auto merged
Diffstat (limited to 'sql/mysqld.cc')
| -rw-r--r-- | sql/mysqld.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sql/mysqld.cc b/sql/mysqld.cc index 382f6683bf6..b62d6c9470a 100644 --- a/sql/mysqld.cc +++ b/sql/mysqld.cc @@ -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; |