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

1 files changed, 10 insertions, 2 deletions

diff --git a/sql/mysql_priv.h b/sql/mysql_priv.h
index f5e43c5100a..fc0c688610b 100644
--- a/sql/mysql_priv.h
+++ b/sql/mysql_priv.h
@@ -156,18 +156,26 @@ typedef struct my_locale_st
   TYPELIB *ab_day_names;
   uint max_month_name_length;
   uint max_day_name_length;
+  uint decimal_point;
+  uint thousand_sep;
+  const char *grouping;
 #ifdef __cplusplus 
   my_locale_st(uint number_par,
                const char *name_par, const char *descr_par, bool is_ascii_par,
                TYPELIB *month_names_par, TYPELIB *ab_month_names_par,
                TYPELIB *day_names_par, TYPELIB *ab_day_names_par,
-               uint max_month_name_length_par, uint max_day_name_length_par) : 
+               uint max_month_name_length_par, uint max_day_name_length_par,
+               uint decimal_point_par, uint thousand_sep_par,
+               const char *grouping_par) : 
     number(number_par),
     name(name_par), description(descr_par), is_ascii(is_ascii_par),
     month_names(month_names_par), ab_month_names(ab_month_names_par),
     day_names(day_names_par), ab_day_names(ab_day_names_par),
     max_month_name_length(max_month_name_length_par),
-    max_day_name_length(max_day_name_length_par)
+    max_day_name_length(max_day_name_length_par),
+    decimal_point(decimal_point_par),
+    thousand_sep(thousand_sep_par),
+    grouping(grouping_par)
   {}
 #endif
 } MY_LOCALE;