summaryrefslogtreecommitdiff
path: root/mysql-test/r/null.result
diff options
context:
space:
mode:
authorunknown <gluh@eagle.intranet.mysql.r18.ru>2005-12-01 15:30:11 +0400
committerunknown <gluh@eagle.intranet.mysql.r18.ru>2005-12-01 15:30:11 +0400
commitc86ba5f5e7aed6baefb1ec7d06a498485411768c (patch)
treea4c4c8f31f5f4da6f1e120861d4711514587f19b /mysql-test/r/null.result
parent952c56ce5b9acfe2f9c0c9fa6b84aadb9c8b41cd (diff)
downloadmariadb-git-c86ba5f5e7aed6baefb1ec7d06a498485411768c.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' mysql-test/r/auto_increment.result: Fix for bug#11491 Misleading error message if not NULL column set to NULL, SQL mode TRADITIONAL result change mysql-test/r/create.result: Fix for bug#11491 Misleading error message if not NULL column set to NULL, SQL mode TRADITIONAL result change mysql-test/r/insert.result: Fix for bug#11491 Misleading error message if not NULL column set to NULL, SQL mode TRADITIONAL result change mysql-test/r/insert_select.result: Fix for bug#11491 Misleading error message if not NULL column set to NULL, SQL mode TRADITIONAL result change mysql-test/r/key.result: Fix for bug#11491 Misleading error message if not NULL column set to NULL, SQL mode TRADITIONAL result change mysql-test/r/null.result: Fix for bug#11491 Misleading error message if not NULL column set to NULL, SQL mode TRADITIONAL result change mysql-test/r/null_key.result: Fix for bug#11491 Misleading error message if not NULL column set to NULL, SQL mode TRADITIONAL result change mysql-test/r/ps_2myisam.result: Fix for bug#11491 Misleading error message if not NULL column set to NULL, SQL mode TRADITIONAL result change mysql-test/r/ps_3innodb.result: Fix for bug#11491 Misleading error message if not NULL column set to NULL, SQL mode TRADITIONAL result change mysql-test/r/ps_4heap.result: Fix for bug#11491 Misleading error message if not NULL column set to NULL, SQL mode TRADITIONAL result change mysql-test/r/ps_5merge.result: Fix for bug#11491 Misleading error message if not NULL column set to NULL, SQL mode TRADITIONAL result change mysql-test/r/ps_6bdb.result: Fix for bug#11491 Misleading error message if not NULL column set to NULL, SQL mode TRADITIONAL result change mysql-test/r/ps_7ndb.result: Fix for bug#11491 Misleading error message if not NULL column set to NULL, SQL mode TRADITIONAL result change mysql-test/r/strict.result: Fix for bug#11491 Misleading error message if not NULL column set to NULL, SQL mode TRADITIONAL result change mysql-test/r/view.result: Fix for bug#11491 Misleading error message if not NULL column set to NULL, SQL mode TRADITIONAL result change mysql-test/r/warnings.result: Fix for bug#11491 Misleading error message if not NULL column set to NULL, SQL mode TRADITIONAL result change mysql-test/t/strict.test: Fix for bug#11491 Misleading error message if not NULL column set to NULL, SQL mode TRADITIONAL test change
Diffstat (limited to 'mysql-test/r/null.result')
-rw-r--r--mysql-test/r/null.result18
1 files changed, 9 insertions, 9 deletions
diff --git a/mysql-test/r/null.result b/mysql-test/r/null.result
index 1425b2a7f89..35c8abf07a4 100644
--- a/mysql-test/r/null.result
+++ b/mysql-test/r/null.result
@@ -97,39 +97,39 @@ Warnings:
Warning 1265 Data truncated for column 'd' at row 1
UPDATE t1 SET d=NULL;
Warnings:
-Warning 1263 Column set to default value; NULL supplied to NOT NULL column 'd' at row 1
+Warning 1048 Column 'd' cannot be null
INSERT INTO t1 (a) values (null);
ERROR 23000: Column 'a' cannot be null
INSERT INTO t1 (a) values (1/null);
ERROR 23000: Column 'a' cannot be null
INSERT INTO t1 (a) values (null),(null);
Warnings:
-Warning 1263 Column set to default value; NULL supplied to NOT NULL column 'a' at row 1
-Warning 1263 Column set to default value; NULL supplied to NOT NULL column 'a' at row 2
+Warning 1048 Column 'a' cannot be null
+Warning 1048 Column 'a' cannot be null
INSERT INTO t1 (b) values (null);
ERROR 23000: Column 'b' cannot be null
INSERT INTO t1 (b) values (1/null);
ERROR 23000: Column 'b' cannot be null
INSERT INTO t1 (b) values (null),(null);
Warnings:
-Warning 1263 Column set to default value; NULL supplied to NOT NULL column 'b' at row 1
-Warning 1263 Column set to default value; NULL supplied to NOT NULL column 'b' at row 2
+Warning 1048 Column 'b' cannot be null
+Warning 1048 Column 'b' cannot be null
INSERT INTO t1 (c) values (null);
ERROR 23000: Column 'c' cannot be null
INSERT INTO t1 (c) values (1/null);
ERROR 23000: Column 'c' cannot be null
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
INSERT INTO t1 (d) values (null);
ERROR 23000: Column 'd' cannot be null
INSERT INTO t1 (d) values (1/null);
ERROR 23000: Column 'd' cannot be null
INSERT INTO t1 (d) values (null),(null);
Warnings:
-Warning 1263 Column set to default value; NULL supplied to NOT NULL column 'd' at row 1
-Warning 1263 Column set to default value; NULL supplied to NOT NULL column 'd' at row 2
+Warning 1048 Column 'd' cannot be null
+Warning 1048 Column 'd' cannot be null
select * from t1;
a b c d
0 0000-00-00 00:00:00 0