diff options
| author | Magne Mahre <magne.mahre@oracle.com> | 2011-02-17 12:53:09 +0100 |
|---|---|---|
| committer | Magne Mahre <magne.mahre@oracle.com> | 2011-02-17 12:53:09 +0100 |
| commit | 5a47bc87c803dc0a875d07e5b748ad14ccab36d5 (patch) | |
| tree | 47614fb0684f8a543db20bd9e82c4181270fea42 /mysql-test/r | |
| parent | 2152cd958d70acbd0721c1245d663a2bb437ef89 (diff) | |
| parent | 6503226743a2fa24c7330d4541560a5b8fa821d6 (diff) | |
| download | mariadb-git-5a47bc87c803dc0a875d07e5b748ad14ccab36d5.tar.gz | |
Merge from 5.1
Diffstat (limited to 'mysql-test/r')
| -rw-r--r-- | mysql-test/r/ctype_cp1250_ch.result | 3 | ||||
| -rw-r--r-- | mysql-test/r/ctype_cp1251.result | 2 | ||||
| -rw-r--r-- | mysql-test/r/ctype_eucjpms.result | 2 |
3 files changed, 7 insertions, 0 deletions
diff --git a/mysql-test/r/ctype_cp1250_ch.result b/mysql-test/r/ctype_cp1250_ch.result index 7f0cdf3f17b..231755a3f69 100644 --- a/mysql-test/r/ctype_cp1250_ch.result +++ b/mysql-test/r/ctype_cp1250_ch.result @@ -238,3 +238,6 @@ select a from t1 where a like "abcdefghá"; a abcdefghá drop table t1; +set global LC_MESSAGES=convert((@@global.log_bin_trust_function_creators) +using cp1250); +ERROR HY000: Unknown locale: '1' diff --git a/mysql-test/r/ctype_cp1251.result b/mysql-test/r/ctype_cp1251.result index 9a781c61e91..202dfe2b7df 100644 --- a/mysql-test/r/ctype_cp1251.result +++ b/mysql-test/r/ctype_cp1251.result @@ -386,6 +386,8 @@ FD FD FD D18D FD FE FE FE D18E FE FF FF FF D18F FF DROP TABLE t1; +set global LC_TIME_NAMES=convert((-8388608) using cp1251); +ERROR HY000: Unknown locale: '-8388608' # # End of 5.1 tests # diff --git a/mysql-test/r/ctype_eucjpms.result b/mysql-test/r/ctype_eucjpms.result index bd25b1beed4..5a402d57e65 100644 --- a/mysql-test/r/ctype_eucjpms.result +++ b/mysql-test/r/ctype_eucjpms.result @@ -9859,6 +9859,8 @@ hex(convert(_eucjpms 0xA5FE41 using ucs2)) select hex(convert(_eucjpms 0x8FABF841 using ucs2)); hex(convert(_eucjpms 0x8FABF841 using ucs2)) 003F0041 +set global LC_TIME_NAMES=convert((convert((0x63) using eucjpms)) using utf8); +ERROR HY000: Unknown locale: 'c' # # Start of 5.5 tests # |