summaryrefslogtreecommitdiff
path: root/mysql-test/r/locale.result
diff options
context:
space:
mode:
authorAlexander Barkov <bar@mysql.com>2009-10-29 15:10:36 +0400
committerAlexander Barkov <bar@mysql.com>2009-10-29 15:10:36 +0400
commit18f63cbcb91dd10c1144f6bff165e5ab57fa0bf1 (patch)
treec4a9dece357a6f4fbdb3893eeb89dc8d4e49895f /mysql-test/r/locale.result
parenteff49de23e87dabb17b07b74f04b104748df8517 (diff)
downloadmariadb-git-18f63cbcb91dd10c1144f6bff165e5ab57fa0bf1.tar.gz
A postfix for Bug#46633 Obsolete Serbian locale name
Re-Allowing sr_YU with a "deprecated" warning.
Diffstat (limited to 'mysql-test/r/locale.result')
-rw-r--r--mysql-test/r/locale.result17
1 files changed, 12 insertions, 5 deletions
diff --git a/mysql-test/r/locale.result b/mysql-test/r/locale.result
index 30c4c928a96..402470b5ae8 100644
--- a/mysql-test/r/locale.result
+++ b/mysql-test/r/locale.result
@@ -49,11 +49,18 @@ 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');
+SET lc_messages=sr_YU;
+Warnings:
+Warning 1287 'sr_YU' is deprecated; use 'sr_RS' instead
+SHOW VARIABLES LIKE 'lc_messages';
+Variable_name Value
+lc_messages sr_RS
+SET lc_messages=sr_RS;
+SHOW VARIABLES LIKE 'lc_messages';
+Variable_name Value
+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