Merging bug#22645 "LC_TIME_NAMES: Statement not replicated" from 4.1.

7c1b675e · bar@mysql.com/bar.intranet.mysql.r18.ru · 58149eaf · 7c1b675e · 7c1b675e · 7c1b675e
Commit 7c1b675e authored Dec 05, 2006 by bar@mysql.com/bar.intranet.mysql.r18.ru
Expand all Show whitespace changes
Inline Side-by-side

Showing with 331 additions and 328 deletions

mysql-test/t/disabled.def mysql-test/t/disabled.def +1 -0

sql/mysql_priv.h sql/mysql_priv.h +3 -1

sql/sql_locale.cc sql/sql_locale.cc +327 -327

No files found.
--- a/mysql-test/t/disabled.def
+++ b/mysql-test/t/disabled.def
@@ -11,5 +11,6 @@
 ##############################################################################
 ndb_load        : Bug#17233
+rpl_locale	: Bug#22645
 user_limits     : Bug#23921 random failure of user_limits.test
--- a/sql/mysql_priv.h
+++ b/sql/mysql_priv.h
@@ -118,9 +118,11 @@ typedef struct my_locale_st
  TYPELIB *day_names;
  TYPELIB *ab_day_names;
 #ifdef __cplusplus 
-  my_locale_st(const char *name_par, const char *descr_par, bool is_ascii_par,
+  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) : 
+    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)

--- a/sql/sql_locale.cc
+++ b/sql/sql_locale.cc