summaryrefslogtreecommitdiff
path: root/mysql-test/r/auto_increment.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/auto_increment.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/auto_increment.result')
-rw-r--r--mysql-test/r/auto_increment.result4
1 files changed, 2 insertions, 2 deletions
diff --git a/mysql-test/r/auto_increment.result b/mysql-test/r/auto_increment.result
index 61a42b004a9..3c1f61f87dd 100644
--- a/mysql-test/r/auto_increment.result
+++ b/mysql-test/r/auto_increment.result
@@ -232,7 +232,7 @@ a b
delete from t1 where a=0;
update t1 set a=NULL where b=6;
Warnings:
-Warning 1263 Column set to default value; NULL supplied to NOT NULL column 'a' at row 4
+Warning 1048 Column 'a' cannot be null
update t1 set a=300 where b=7;
SET SQL_MODE='';
insert into t1(a,b)values(NULL,8);
@@ -274,7 +274,7 @@ a b
delete from t1 where a=0;
update t1 set a=NULL where b=13;
Warnings:
-Warning 1263 Column set to default value; NULL supplied to NOT NULL column 'a' at row 9
+Warning 1048 Column 'a' cannot be null
update t1 set a=500 where b=14;
select * from t1 order by b;
a b