1berry/MariaDB-server
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
bar@mysql.com/bar.intranet.mysql.r18.ru 2006-12-05 16:01:21 +04:00
parent 58149eaf61
commit 7c1b675e72
3 changed files with 331 additions and 328 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
mysql-test/t/disabled.def
View File

@ -11,5 +11,6 @@
##############################################################################
ndb_load : Bug#17233
rpl_locale : Bug#22645
user_limits : Bug#23921 random failure of user_limits.test

4
sql/mysql_priv.h
View File

@ -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)

654
sql/sql_locale.cc
View File

File diff suppressed because it is too large Load Diff