diff options
| author | Alexander Barkov <bar@mysql.com> | 2009-10-05 20:06:04 +0500 |
|---|---|---|
| committer | Alexander Barkov <bar@mysql.com> | 2009-10-05 20:06:04 +0500 |
| commit | 636ea6a1c464b247a3665bebac7bf28495ac087a (patch) | |
| tree | 7ea09d9be115743b02431c299c6f2a442eeb8009 /sql/set_var.cc | |
| parent | 80f6940f07978bff7de4433a9bc3626b974698f0 (diff) | |
| download | mariadb-git-636ea6a1c464b247a3665bebac7bf28495ac087a.tar.gz | |
WL#4584 Internationalized number format
@ mysql-test/r/func_str.result
Adding tests
@ mysql-test/t/func_str.test
Adding tests
@ mysql-test/t/variables.test
Fixing error number
@ sql/item_create.cc
Allowing 2 and 3 arguments to format()
@ sql/item_strfunc.cc
Adding new formatting code.
@ sql/item_strfunc.h
Adding new contructors and "locale" member
@ sql/mysql_priv.h
Adding number formatting members into MY_LOCALE
@ sql/sql_locale.cc
Adding number formatting data into locale constants
@ sql/set_var.cc
Using new error message
@ sql/share/errmgs.txt
Adding new error message
Diffstat (limited to 'sql/set_var.cc')
| -rw-r--r-- | sql/set_var.cc | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/sql/set_var.cc b/sql/set_var.cc index 2e2bb369af1..def0be4aff4 100644 --- a/sql/set_var.cc +++ b/sql/set_var.cc @@ -2916,7 +2916,7 @@ bool sys_var_thd_lc_time_names::check(THD *thd, set_var *var) { char buf[20]; int10_to_str((int) var->value->val_int(), buf, -10); - my_printf_error(ER_UNKNOWN_ERROR, "Unknown locale: '%s'", MYF(0), buf); + my_printf_error(ER_UNKNOWN_LOCALE, ER(ER_UNKNOWN_LOCALE), MYF(0), buf); return 1; } } @@ -2932,8 +2932,7 @@ bool sys_var_thd_lc_time_names::check(THD *thd, set_var *var) const char *locale_str= res->c_ptr(); if (!(locale_match= my_locale_by_name(locale_str))) { - my_printf_error(ER_UNKNOWN_ERROR, - "Unknown locale: '%s'", MYF(0), locale_str); + my_printf_error(ER_UNKNOWN_LOCALE, ER(ER_UNKNOWN_LOCALE), MYF(0), locale_str); return 1; } } |