summaryrefslogtreecommitdiff
path: root/mysql-test/r/ctype_cp1251.result
diff options
context:
space:
mode:
authorMagne Mahre <magne.mahre@oracle.com>2011-02-17 12:53:09 +0100
committerMagne Mahre <magne.mahre@oracle.com>2011-02-17 12:53:09 +0100
commit5a47bc87c803dc0a875d07e5b748ad14ccab36d5 (patch)
tree47614fb0684f8a543db20bd9e82c4181270fea42 /mysql-test/r/ctype_cp1251.result
parent2152cd958d70acbd0721c1245d663a2bb437ef89 (diff)
parent6503226743a2fa24c7330d4541560a5b8fa821d6 (diff)
downloadmariadb-git-5a47bc87c803dc0a875d07e5b748ad14ccab36d5.tar.gz
Merge from 5.1
Diffstat (limited to 'mysql-test/r/ctype_cp1251.result')
-rw-r--r--mysql-test/r/ctype_cp1251.result2
1 files changed, 2 insertions, 0 deletions
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
#