summaryrefslogtreecommitdiff
path: root/mysql-test/t/strict.test
diff options
context:
space:
mode:
authorunknown <jimw@mysql.com>2005-04-05 19:45:34 -0700
committerunknown <jimw@mysql.com>2005-04-05 19:45:34 -0700
commit5cdec5d6ba0c3fac2fe312da3e98c9506091a0a7 (patch)
treeb51927fa62cfdff1d3b10fd3678491743e115f13 /mysql-test/t/strict.test
parent51653cb239a715c754c1e8a7352fedf47393a872 (diff)
parent2f19824d20c49b244c89c008437eb6c1281222b3 (diff)
downloadmariadb-git-5cdec5d6ba0c3fac2fe312da3e98c9506091a0a7.tar.gz
Merge
mysql-test/r/create.result: Auto merged mysql-test/r/ctype_latin1_de.result: Auto merged mysql-test/r/grant.result: Auto merged mysql-test/r/grant2.result: Auto merged mysql-test/r/limit.result: Auto merged mysql-test/r/order_by.result: Auto merged mysql-test/r/rpl000001.result: Auto merged mysql-test/r/sp.result: Auto merged mysql-test/r/strict.result: Auto merged mysql-test/r/type_blob.result: Auto merged mysql-test/r/type_ranges.result: Auto merged mysql-test/r/warnings.result: Auto merged mysql-test/t/ctype_latin1_de.test: Auto merged mysql-test/t/limit.test: Auto merged mysql-test/t/order_by.test: Auto merged mysql-test/t/show_check.test: Auto merged mysql-test/t/sp.test: Auto merged mysql-test/t/type_blob.test: Auto merged mysql-test/t/type_ranges.test: Auto merged sql/item.cc: Auto merged sql/item.h: Auto merged sql/sql_insert.cc: Auto merged mysql-test/t/strict.test: SCCS merged
Diffstat (limited to 'mysql-test/t/strict.test')
-rw-r--r--mysql-test/t/strict.test34
1 files changed, 34 insertions, 0 deletions
diff --git a/mysql-test/t/strict.test b/mysql-test/t/strict.test
index 6b7ce1a8f9e..333ec40b1b9 100644
--- a/mysql-test/t/strict.test
+++ b/mysql-test/t/strict.test
@@ -1049,3 +1049,37 @@ drop table t1;
# Restore mode
#
set sql_mode=@org_mode;
+
+# Test fields with no default value that are NOT NULL (Bug #5986)
+SET @@sql_mode = 'traditional';
+CREATE TABLE t1 (i int not null);
+--error 1364
+INSERT INTO t1 VALUES ();
+--error 1364
+INSERT INTO t1 VALUES (DEFAULT);
+--error 1364
+INSERT INTO t1 VALUES (DEFAULT(i));
+ALTER TABLE t1 ADD j int;
+--error 1364
+INSERT INTO t1 SET j = 1;
+--error 1364
+INSERT INTO t1 SET j = 1, i = DEFAULT;
+--error 1364
+INSERT INTO t1 SET j = 1, i = DEFAULT(i);
+--error 1364
+INSERT INTO t1 VALUES (DEFAULT,1);
+DROP TABLE t1;
+SET @@sql_mode = '';
+CREATE TABLE t1 (i int not null);
+INSERT INTO t1 VALUES ();
+INSERT INTO t1 VALUES (DEFAULT);
+# DEFAULT(i) is an error even with the default sql_mode
+--error 1364
+INSERT INTO t1 VALUES (DEFAULT(i));
+ALTER TABLE t1 ADD j int;
+INSERT INTO t1 SET j = 1;
+INSERT INTO t1 SET j = 1, i = DEFAULT;
+--error 1364
+INSERT INTO t1 SET j = 1, i = DEFAULT(i);
+INSERT INTO t1 VALUES (DEFAULT,1);
+DROP TABLE t1;