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

Bug#46633 Obsolete Serbian locale name

Browse Source 
- Renaming sr_YU to sr_RS
- Adding test case
This commit is contained in:
Alexander Barkov 2009-10-19 12:52:29 +05:00
parent de7d1abe93
commit d850a57c3b
3 changed files with 46 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
mysql-test/r/locale.result
View File

@ -46,4 +46,14 @@ SELECT format(123456.789, 3, 'el_GR');
format(123456.789, 3, 'el_GR') format(123456.789, 3, 'el_GR')
123456.789 123456.789
DROP TABLE t1; DROP TABLE t1;
#
# Bug#46633 Obsolete Serbian locale name
#
set lc_messages=sr_YU;
ERROR HY000: Unknown locale: 'sr_YU'
set lc_messages=sr_RS;
set lc_time_names=sr_RS;
select format(123456.789, 3, 'sr_RS');
format(123456.789, 3, 'sr_RS')
123456.789
End of 5.4 tests End of 5.4 tests

9
mysql-test/t/locale.test
View File

@ -31,4 +31,13 @@ SELECT a, date_format(a,'%b') as abmon, monthname(a) as mon FROM t1 ORDER BY a;
SELECT format(123456.789, 3, 'el_GR'); SELECT format(123456.789, 3, 'el_GR');
DROP TABLE t1; DROP TABLE t1;
--echo #
--echo # Bug#46633 Obsolete Serbian locale name
--echo #
--error ER_UNKNOWN_LOCALE
set lc_messages=sr_YU;
set lc_messages=sr_RS;
set lc_time_names=sr_RS;
select format(123456.789, 3, 'sr_RS');
--echo End of 5.4 tests --echo End of 5.4 tests

54
sql/sql_locale.cc
View File

@ -26,7 +26,7 @@
enum err_msgs_index enum err_msgs_index
{ {
en_US= 0, cs_CZ, da_DK, nl_NL, et_EE, fr_FR, de_DE, el_GR, hu_HU, it_IT, en_US= 0, cs_CZ, da_DK, nl_NL, et_EE, fr_FR, de_DE, el_GR, hu_HU, it_IT,
ja_JP, ko_KR, no_NO, nn_NO, pl_PL, pt_PT, ro_RO, ru_RU, sr_CS, sk_SK, ja_JP, ko_KR, no_NO, nn_NO, pl_PL, pt_PT, ro_RO, ru_RU, sr_RS, sk_SK,
es_ES, sv_SE, uk_UA es_ES, sv_SE, uk_UA
} ERR_MSGS_INDEX; } ERR_MSGS_INDEX;
@ -1716,41 +1716,41 @@ MY_LOCALE my_locale_sq_AL
); );
/***** LOCALE END sq_AL *****/ /***** LOCALE END sq_AL *****/
/***** LOCALE BEGIN sr_YU: Servian - Yugoslavia *****/ /***** LOCALE BEGIN sr_RS: Serbian - Serbia *****/
static const char *my_locale_month_names_sr_YU[13] = static const char *my_locale_month_names_sr_RS[13] =
{"januar","februar","mart","april","maj","juni","juli","avgust","septembar","oktobar","novembar","decembar", NullS }; {"januar","februar","mart","april","maj","juni","juli","avgust","septembar","oktobar","novembar","decembar", NullS };
static const char *my_locale_ab_month_names_sr_YU[13] = static const char *my_locale_ab_month_names_sr_RS[13] =
{"jan","feb","mar","apr","maj","jun","jul","avg","sep","okt","nov","dec", NullS }; {"jan","feb","mar","apr","maj","jun","jul","avg","sep","okt","nov","dec", NullS };
static const char *my_locale_day_names_sr_YU[8] = static const char *my_locale_day_names_sr_RS[8] =
{"ponedeljak","utorak","sreda","četvrtak","petak","subota","nedelja", NullS }; {"ponedeljak","utorak","sreda","četvrtak","petak","subota","nedelja", NullS };
static const char *my_locale_ab_day_names_sr_YU[8] = static const char *my_locale_ab_day_names_sr_RS[8] =
{"pon","uto","sre","čet","pet","sub","ned", NullS }; {"pon","uto","sre","čet","pet","sub","ned", NullS };
static TYPELIB my_locale_typelib_month_names_sr_YU = static TYPELIB my_locale_typelib_month_names_sr_RS =
{ array_elements(my_locale_month_names_sr_YU)-1, "", my_locale_month_names_sr_YU, NULL }; { array_elements(my_locale_month_names_sr_RS)-1, "", my_locale_month_names_sr_RS, NULL };
static TYPELIB my_locale_typelib_ab_month_names_sr_YU = static TYPELIB my_locale_typelib_ab_month_names_sr_RS =
{ array_elements(my_locale_ab_month_names_sr_YU)-1, "", my_locale_ab_month_names_sr_YU, NULL }; { array_elements(my_locale_ab_month_names_sr_RS)-1, "", my_locale_ab_month_names_sr_RS, NULL };
static TYPELIB my_locale_typelib_day_names_sr_YU = static TYPELIB my_locale_typelib_day_names_sr_RS =
{ array_elements(my_locale_day_names_sr_YU)-1, "", my_locale_day_names_sr_YU, NULL }; { array_elements(my_locale_day_names_sr_RS)-1, "", my_locale_day_names_sr_RS, NULL };
static TYPELIB my_locale_typelib_ab_day_names_sr_YU = static TYPELIB my_locale_typelib_ab_day_names_sr_RS =
{ array_elements(my_locale_ab_day_names_sr_YU)-1, "", my_locale_ab_day_names_sr_YU, NULL }; { array_elements(my_locale_ab_day_names_sr_RS)-1, "", my_locale_ab_day_names_sr_RS, NULL };
MY_LOCALE my_locale_sr_YU MY_LOCALE my_locale_sr_RS
( (
48, 48,
"sr_YU", "sr_RS",
"Servian - Yugoslavia", "Serbian - Serbia",
FALSE, FALSE,
&my_locale_typelib_month_names_sr_YU, &my_locale_typelib_month_names_sr_RS,
&my_locale_typelib_ab_month_names_sr_YU, &my_locale_typelib_ab_month_names_sr_RS,
&my_locale_typelib_day_names_sr_YU, &my_locale_typelib_day_names_sr_RS,
&my_locale_typelib_ab_day_names_sr_YU, &my_locale_typelib_ab_day_names_sr_RS,
9, 9,
10, 10,
'.', /* decimal point sr_YU */ '.', /* decimal point sr_RS */
'\0', /* thousands_sep sr_YU */ '\0', /* thousands_sep sr_RS */
"\x80", /* grouping sr_YU */ "\x80", /* grouping sr_RS */
&global_errmsgs[sr_CS] &global_errmsgs[sr_RS]
); );
/***** LOCALE END sr_YU *****/ /***** LOCALE END sr_RS *****/
/***** LOCALE BEGIN sv_SE: Swedish - Sweden *****/ /***** LOCALE BEGIN sv_SE: Swedish - Sweden *****/
static const char *my_locale_month_names_sv_SE[13] = static const char *my_locale_month_names_sv_SE[13] =
@ -3281,7 +3281,7 @@ MY_LOCALE *my_locales[]=
&my_locale_sk_SK, &my_locale_sk_SK,
&my_locale_sl_SI, &my_locale_sl_SI,
&my_locale_sq_AL, &my_locale_sq_AL,
&my_locale_sr_YU, &my_locale_sr_RS,
&my_locale_ta_IN, &my_locale_ta_IN,
&my_locale_te_IN, &my_locale_te_IN,
&my_locale_th_TH, &my_locale_th_TH,