summaryrefslogtreecommitdiff
path: root/mysql-test/r/key.result
diff options
context:
space:
mode:
authorgluh@eagle.intranet.mysql.r18.ru <>2005-12-01 15:30:11 +0400
committergluh@eagle.intranet.mysql.r18.ru <>2005-12-01 15:30:11 +0400
commit21cc3ae5614434dd3b12ebb10a16b9656dba5d48 (patch)
treea4c4c8f31f5f4da6f1e120861d4711514587f19b /mysql-test/r/key.result
parentfb057f13fb102887d8bed3c518aa5bd1419d92d5 (diff)
downloadmariadb-git-21cc3ae5614434dd3b12ebb10a16b9656dba5d48.tar.gz
Fix for bug#11491 Misleading error message if not NULL column set to NULL,
SQL mode TRADITIONAL Message is chenged from 'ER_WARN_NULL_TO_NOTNULL' to 'ER_BAD_NULL_ERROR'
Diffstat (limited to 'mysql-test/r/key.result')
-rw-r--r--mysql-test/r/key.result4
1 files changed, 2 insertions, 2 deletions
diff --git a/mysql-test/r/key.result b/mysql-test/r/key.result
index bc9d3935bc4..095c8798b29 100644
--- a/mysql-test/r/key.result
+++ b/mysql-test/r/key.result
@@ -159,8 +159,8 @@ CREATE TABLE t1 (c CHAR(10) NOT NULL,i INT NOT NULL AUTO_INCREMENT,
UNIQUE (c,i));
INSERT INTO t1 (c) VALUES (NULL),(NULL);
Warnings:
-Warning 1263 Column set to default value; NULL supplied to NOT NULL column 'c' at row 1
-Warning 1263 Column set to default value; NULL supplied to NOT NULL column 'c' at row 2
+Warning 1048 Column 'c' cannot be null
+Warning 1048 Column 'c' cannot be null
SELECT * FROM t1;
c i
1