summaryrefslogtreecommitdiff
path: root/mysql-test
diff options
context:
space:
mode:
authorbell@sanja.is.com.ua <>2004-03-30 23:38:56 +0300
committerbell@sanja.is.com.ua <>2004-03-30 23:38:56 +0300
commite3a619f0059c6f3a90a21b0e8219b049e5056ee3 (patch)
tree040a63eb96cf56a15dd16793212073d9f05a9390 /mysql-test
parent54d5f4ae8f9d49ab4f023be652346d169b4f34d4 (diff)
downloadmariadb-git-e3a619f0059c6f3a90a21b0e8219b049e5056ee3.tar.gz
null processing for character_set_results (BUG#3296)
Diffstat (limited to 'mysql-test')
-rw-r--r--mysql-test/r/query_cache.result5
-rw-r--r--mysql-test/t/query_cache.test6
2 files changed, 11 insertions, 0 deletions
diff --git a/mysql-test/r/query_cache.result b/mysql-test/r/query_cache.result
index bbba7026b14..8d03a7bbcf0 100644
--- a/mysql-test/r/query_cache.result
+++ b/mysql-test/r/query_cache.result
@@ -846,4 +846,9 @@ SELECT * FROM test.t1;
a
USE test;
DROP TABLE t1;
+set character_set_results=null;
+select @@character_set_results;
+@@character_set_results
+NULL
+set character_set_results=default;
SET GLOBAL query_cache_size=0;
diff --git a/mysql-test/t/query_cache.test b/mysql-test/t/query_cache.test
index 31aa69e32ec..b3111b614c6 100644
--- a/mysql-test/t/query_cache.test
+++ b/mysql-test/t/query_cache.test
@@ -620,5 +620,11 @@ SELECT * FROM test.t1;
USE test;
DROP TABLE t1;
+#
+# charset with NULL
+#
+set character_set_results=null;
+select @@character_set_results;
+set character_set_results=default;
SET GLOBAL query_cache_size=0;