summaryrefslogtreecommitdiff
path: root/mysql-test/main/locale.result
diff options
context:
space:
mode:
authorMarko Mäkelä <marko.makela@mariadb.com>2020-01-31 11:37:12 +0200
committerMarko Mäkelä <marko.makela@mariadb.com>2020-01-31 11:37:12 +0200
commit5ff66fb0b97fa3f8ecc453c48bac48ceae76bdea (patch)
treeb33d1e67c5a03abd85abe023f078d0201b12adeb /mysql-test/main/locale.result
parentdbbe9961a53cad97544499c3187771df64f25b18 (diff)
parent256994ef7469fc4c62d5b271a6557ad729380f0e (diff)
downloadmariadb-git-5ff66fb0b97fa3f8ecc453c48bac48ceae76bdea.tar.gz
Merge 10.2 into 10.3
Diffstat (limited to 'mysql-test/main/locale.result')
-rw-r--r--mysql-test/main/locale.result2
1 files changed, 1 insertions, 1 deletions
diff --git a/mysql-test/main/locale.result b/mysql-test/main/locale.result
index b750d038205..f136e9e99ab 100644
--- a/mysql-test/main/locale.result
+++ b/mysql-test/main/locale.result
@@ -51,7 +51,7 @@ DROP TABLE t1;
#
SET lc_messages=sr_YU;
Warnings:
-Warning 1287 'sr_YU' is deprecated and will be removed in a future release. Please use sr_RS instead
+Warning 1287 'sr_YU' ist veraltet. Bitte benutzen Sie 'sr_RS'
SHOW VARIABLES LIKE 'lc_messages';
Variable_name Value
lc_messages sr_RS