summaryrefslogtreecommitdiff
path: root/mysql-test/r/ps_3innodb.result
diff options
context:
space:
mode:
authorunknown <gluh@mysql.com/eagle.(none)>2007-05-30 17:04:04 +0500
committerunknown <gluh@mysql.com/eagle.(none)>2007-05-30 17:04:04 +0500
commit11b084102da1209a26c24c33afd548cb958c026e (patch)
tree134c11bc469ee4aabe754acc47d156b38759bbed /mysql-test/r/ps_3innodb.result
parentd393c9e666642dcd78258d63cbf362e7edde9bb3 (diff)
downloadmariadb-git-11b084102da1209a26c24c33afd548cb958c026e.tar.gz
backport of Bug#11491 Misleading error message if not NULL column set to NULL, SQL mode TRADITIONAL
mysql-test/r/auto_increment.result: result fix mysql-test/r/create.result: result fix mysql-test/r/insert.result: result fix mysql-test/r/insert_select.result: result fix mysql-test/r/insert_update.result: result fix mysql-test/r/key.result: result fix mysql-test/r/null.result: result fix mysql-test/r/null_key.result: result fix mysql-test/r/ps_2myisam.result: result fix mysql-test/r/ps_3innodb.result: result fix mysql-test/r/ps_4heap.result: result fix mysql-test/r/ps_5merge.result: result fix mysql-test/r/ps_6bdb.result: result fix mysql-test/r/ps_7ndb.result: result fix mysql-test/r/strict.result: result fix mysql-test/r/view.result: result fix mysql-test/r/warnings.result: result fix mysql-test/t/strict.test: test fix
Diffstat (limited to 'mysql-test/r/ps_3innodb.result')
-rw-r--r--mysql-test/r/ps_3innodb.result2
1 files changed, 1 insertions, 1 deletions
diff --git a/mysql-test/r/ps_3innodb.result b/mysql-test/r/ps_3innodb.result
index c53056cfa0e..235660cbbaf 100644
--- a/mysql-test/r/ps_3innodb.result
+++ b/mysql-test/r/ps_3innodb.result
@@ -1287,7 +1287,7 @@ set @arg00=NULL;
set @arg01=2;
execute stmt1 using @arg00, @arg01;
Warnings:
-Warning 1263 Column was set to data type implicit default; NULL supplied for NOT NULL column 'a' at row 1
+Warning 1048 Column 'a' cannot be null
select a,b from t1 order by a;
a b
0 two