summaryrefslogtreecommitdiff
path: root/mysql-test/include
diff options
context:
space:
mode:
authorunknown <hhunger@hh-nb.hungers>2008-04-15 15:44:11 +0200
committerunknown <hhunger@hh-nb.hungers>2008-04-15 15:44:11 +0200
commit26a355d14af773c8a7b06c37adb36b98af98abea (patch)
tree12fa1b8204147db79b4bf6dabbd07c94699bc532 /mysql-test/include
parent62f9273302c8c2617593f05f100aec1fc84daf5f (diff)
downloadmariadb-git-26a355d14af773c8a7b06c37adb36b98af98abea.tar.gz
Third set of fixes for bug#35988.
Diffstat (limited to 'mysql-test/include')
-rw-r--r--mysql-test/include/charset_basic.inc1
-rw-r--r--mysql-test/include/collation_basic.inc2
2 files changed, 2 insertions, 1 deletions
diff --git a/mysql-test/include/charset_basic.inc b/mysql-test/include/charset_basic.inc
index ebe3b8633cb..e3331697f2c 100644
--- a/mysql-test/include/charset_basic.inc
+++ b/mysql-test/include/charset_basic.inc
@@ -4,6 +4,7 @@
+--Error 0,ER_UNKNOWN_CHARACTER_SET
eval SET $charset_variable = big5;
eval SELECT $charset_variable;
eval SET $charset_variable = dec8;
diff --git a/mysql-test/include/collation_basic.inc b/mysql-test/include/collation_basic.inc
index 5e983ad3163..be8ae36eeb8 100644
--- a/mysql-test/include/collation_basic.inc
+++ b/mysql-test/include/collation_basic.inc
@@ -1,7 +1,7 @@
#
# This auxiliary file is used by collation variables
#
-
+--Error 0,ER_UNKNOWN_CHARACTER_SET
eval SET $collation_variable = big5_chinese_ci;
eval SELECT $collation_variable;
eval SET $collation_variable = big5_bin;