summaryrefslogtreecommitdiff
path: root/mysql-test/r/variables.result
diff options
context:
space:
mode:
authorbar@bar.intranet.mysql.r18.ru <>2004-03-29 18:33:24 +0500
committerbar@bar.intranet.mysql.r18.ru <>2004-03-29 18:33:24 +0500
commit928e796e67ac37a6a07d609eed2917f5ea228911 (patch)
tree7fc48402cfca442977ac848a9b63af8563851f2d /mysql-test/r/variables.result
parent11f14e005083fa80d10d2f2f1b1dede49cd7cdd3 (diff)
downloadmariadb-git-928e796e67ac37a6a07d609eed2917f5ea228911.tar.gz
Better error messages for not nullable
SET character_set_xxx=NULL and SET collation_xxx=NULL
Diffstat (limited to 'mysql-test/r/variables.result')
-rw-r--r--mysql-test/r/variables.result4
1 files changed, 4 insertions, 0 deletions
diff --git a/mysql-test/r/variables.result b/mysql-test/r/variables.result
index ab550026dbc..aaf977efe50 100644
--- a/mysql-test/r/variables.result
+++ b/mysql-test/r/variables.result
@@ -233,6 +233,10 @@ set character_set_client=UNKNOWN_CHARACTER_SET;
ERROR 42000: Unknown character set: 'UNKNOWN_CHARACTER_SET'
set collation_connection=UNKNOWN_COLLATION;
ERROR HY000: Unknown collation: 'UNKNOWN_COLLATION'
+set character_set_client=NULL;
+ERROR 42000: Variable 'character_set_client' can't be set to the value of 'NULL'
+set collation_connection=NULL;
+ERROR 42000: Variable 'collation_connection' can't be set to the value of 'NULL'
set global autocommit=1;
ERROR HY000: Variable 'autocommit' is a SESSION variable and can't be used with SET GLOBAL
select @@global.timestamp;