Commit d641ef24 authored by unknown's avatar unknown

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


mysql-test/t/disabled.def:
  Disabling test in 5.0 temporarily
sql/mysql_priv.h:
  Adding number_par agrument to constructor
sql/sql_locale.cc:
  Using constructor, instead of structure initialization.
parent f0b4cad3
...@@ -11,5 +11,6 @@ ...@@ -11,5 +11,6 @@
############################################################################## ##############################################################################
ndb_load : Bug#17233 ndb_load : Bug#17233
rpl_locale : Bug#22645
user_limits : Bug#23921 random failure of user_limits.test user_limits : Bug#23921 random failure of user_limits.test
...@@ -118,9 +118,11 @@ typedef struct my_locale_st ...@@ -118,9 +118,11 @@ typedef struct my_locale_st
TYPELIB *day_names; TYPELIB *day_names;
TYPELIB *ab_day_names; TYPELIB *ab_day_names;
#ifdef __cplusplus #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 *month_names_par, TYPELIB *ab_month_names_par,
TYPELIB *day_names_par, TYPELIB *ab_day_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), name(name_par), description(descr_par), is_ascii(is_ascii_par),
month_names(month_names_par), ab_month_names(ab_month_names_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) day_names(day_names_par), ab_day_names(ab_day_names_par)
......
This diff is collapsed.
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment