diff options
| author | Ekaterine Papava <papava.e@gtu.ge> | 2023-03-06 11:04:48 +0100 |
|---|---|---|
| committer | Daniel Black <daniel@mariadb.org> | 2023-03-08 11:22:57 +1100 |
| commit | 6b8370a90f2670641e673ff5bac8431eac7b7b96 (patch) | |
| tree | 66d9ecb668b12fb143aa50e32fe7804c53c63500 /mysql-test/main | |
| parent | b56c613e2d081cc0713c8ca6ae27ad9176d8ac3d (diff) | |
| download | mariadb-git-6b8370a90f2670641e673ff5bac8431eac7b7b96.tar.gz | |
MDEV-30789: Add Georgian error messages and locale
Test case and minor fixes by Daniel Black
Reviewer: Alexander Barkov
Diffstat (limited to 'mysql-test/main')
| -rw-r--r-- | mysql-test/main/locale.result | 10 | ||||
| -rw-r--r-- | mysql-test/main/locale.test | 15 | ||||
| -rw-r--r-- | mysql-test/main/variables.result | 10 | ||||
| -rw-r--r-- | mysql-test/main/variables.test | 5 |
4 files changed, 33 insertions, 7 deletions
diff --git a/mysql-test/main/locale.result b/mysql-test/main/locale.result index d29482ceffa..39f11053df6 100644 --- a/mysql-test/main/locale.result +++ b/mysql-test/main/locale.result @@ -306,3 +306,13 @@ date_format('2001-01-06', '%w %a %W', 'de_CH') select date_format('2001-09-01', '%c %b %M', 'de_CH'); date_format('2001-09-01', '%c %b %M', 'de_CH') 9 Sep September +# +# MDEV-30789 Add Georgian error messages and locale +# +SET lc_messages=ka_GE; +SELECT x; +ERROR 42S22: უცნობი სვეტი 'x' 'field list'-ში +SET lc_messages=DEFAULT; +# +# End of 10.11 tests +# diff --git a/mysql-test/main/locale.test b/mysql-test/main/locale.test index a9a507bc387..9f4ceb270d9 100644 --- a/mysql-test/main/locale.test +++ b/mysql-test/main/locale.test @@ -181,3 +181,18 @@ select date_format('2001-10-01', '%c %b %M', 'rm_CH'); select date_format('2001-12-01', '%c %b %M', 'rm_CH'); select date_format('2001-01-06', '%w %a %W', 'de_CH'); select date_format('2001-09-01', '%c %b %M', 'de_CH'); + + +--echo # +--echo # MDEV-30789 Add Georgian error messages and locale +--echo # + +SET lc_messages=ka_GE; +--error ER_BAD_FIELD_ERROR +SELECT x; + +SET lc_messages=DEFAULT; + +--echo # +--echo # End of 10.11 tests +--echo # diff --git a/mysql-test/main/variables.result b/mysql-test/main/variables.result index f6817a2a4d2..9b54a24be71 100644 --- a/mysql-test/main/variables.result +++ b/mysql-test/main/variables.result @@ -777,16 +777,16 @@ select @@lc_time_names; @@lc_time_names en_US LC_TIME_NAMES: testing locale with the last ID: -set lc_time_names=110; +set lc_time_names=111; select @@lc_time_names; @@lc_time_names -rm_CH +ka_GE LC_TIME_NAMES: testing a number beyond the valid ID range: -set lc_time_names=111; -ERROR HY000: Unknown locale: '111' +set lc_time_names=112; +ERROR HY000: Unknown locale: '112' select @@lc_time_names; @@lc_time_names -rm_CH +ka_GE LC_TIME_NAMES: testing that 0 is en_US: set lc_time_names=0; select @@lc_time_names; diff --git a/mysql-test/main/variables.test b/mysql-test/main/variables.test index c8b36925df6..89267560ca6 100644 --- a/mysql-test/main/variables.test +++ b/mysql-test/main/variables.test @@ -538,12 +538,13 @@ set lc_time_names=NULL; --error ER_UNKNOWN_LOCALE set lc_time_names=-1; select @@lc_time_names; +# note same boundary condition tests in sys_vars.lc_time_names_basic --echo LC_TIME_NAMES: testing locale with the last ID: -set lc_time_names=110; +set lc_time_names=111; select @@lc_time_names; --echo LC_TIME_NAMES: testing a number beyond the valid ID range: --error ER_UNKNOWN_LOCALE -set lc_time_names=111; +set lc_time_names=112; select @@lc_time_names; --echo LC_TIME_NAMES: testing that 0 is en_US: set lc_time_names=0; |