Commit 7c1b675e authored by bar@mysql.com/bar.intranet.mysql.r18.ru's avatar bar@mysql.com/bar.intranet.mysql.r18.ru
Browse files

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

parent 58149eaf

mysql-test/t/disabled.def

+1 −0
Original line number Diff line number Diff line
@@ -11,5 +11,6 @@ 
##############################################################################



ndb_load        : Bug#17233

rpl_locale	: Bug#22645

user_limits     : Bug#23921 random failure of user_limits.test

sql/mysql_priv.h

+3 −1
Original line number Diff line number Diff line
@@ -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)

sql/sql_locale.cc

+327 −327

File changed.

Preview size limit exceeded, changes collapsed.