diff options
author | Olivier Bertrand <bertrandop@gmail.com> | 2014-08-07 19:12:45 +0200 |
---|---|---|
committer | Olivier Bertrand <bertrandop@gmail.com> | 2014-08-07 19:12:45 +0200 |
commit | f835588cc2e32da97269cc58e97ee77b5927498a (patch) | |
tree | 8e5c53593e7e3a9db0892afefb118fd0d581e23a /mysql-test/suite/sys_vars/r/lc_time_names_basic.result | |
parent | 0219ac1e98cc53250a8e165c4b37e83529932256 (diff) | |
parent | b81b6d3f836feb682b963c9489f00ca1ee6a6a95 (diff) | |
download | mariadb-git-f835588cc2e32da97269cc58e97ee77b5927498a.tar.gz |
- Commiting merge files
Diffstat (limited to 'mysql-test/suite/sys_vars/r/lc_time_names_basic.result')
-rw-r--r-- | mysql-test/suite/sys_vars/r/lc_time_names_basic.result | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/mysql-test/suite/sys_vars/r/lc_time_names_basic.result b/mysql-test/suite/sys_vars/r/lc_time_names_basic.result index e61436c0e47..ed03c3e6d94 100644 --- a/mysql-test/suite/sys_vars/r/lc_time_names_basic.result +++ b/mysql-test/suite/sys_vars/r/lc_time_names_basic.result @@ -1022,7 +1022,11 @@ SELECT @@lc_time_names; @@lc_time_names el_GR SET @@lc_time_names = 110; -ERROR HY000: Unknown locale: '110' +SELECT @@lc_time_names; +@@lc_time_names +rm_CH +SET @@lc_time_names = 111; +ERROR HY000: Unknown locale: '111' '#--------------------FN_DYNVARS_060_10-------------------------#' SET @@lc_time_names = en_EN; ERROR HY000: Unknown locale: 'en_EN' |