diff options
| author | unknown <jimw@mysql.com> | 2005-04-05 20:55:06 -0700 |
|---|---|---|
| committer | unknown <jimw@mysql.com> | 2005-04-05 20:55:06 -0700 |
| commit | 566460ac64e03b2d5f44961e352965ca24bdb911 (patch) | |
| tree | b8285491e42dccf4487710f0b23b4056dbe867b9 /mysql-test/r/strict.result | |
| parent | 5cdec5d6ba0c3fac2fe312da3e98c9506091a0a7 (diff) | |
| download | mariadb-git-566460ac64e03b2d5f44961e352965ca24bdb911.tar.gz | |
Update tests after merge of bug fix.
mysql-test/r/null.result:
Update results
mysql-test/r/show_check.result:
Update results
mysql-test/r/strict.result:
Update results
mysql-test/t/null.test:
Fix default for smallint column.
mysql-test/t/show_check.test:
Fix default for bool column.
Diffstat (limited to 'mysql-test/r/strict.result')
| -rw-r--r-- | mysql-test/r/strict.result | 82 |
1 files changed, 41 insertions, 41 deletions
diff --git a/mysql-test/r/strict.result b/mysql-test/r/strict.result index 5e1768a207e..7d1b6b67fd2 100644 --- a/mysql-test/r/strict.result +++ b/mysql-test/r/strict.result @@ -1042,47 +1042,6 @@ col1 col2 3 99 DROP TABLE t1; -SET @@sql_mode = 'traditional'; -CREATE TABLE t1 (i int not null); -INSERT INTO t1 VALUES (); -ERROR HY000: Field 'i' doesn't have a default value -INSERT INTO t1 VALUES (DEFAULT); -ERROR HY000: Field 'i' doesn't have a default value -INSERT INTO t1 VALUES (DEFAULT(i)); -ERROR HY000: Field 'i' doesn't have a default value -ALTER TABLE t1 ADD j int; -INSERT INTO t1 SET j = 1; -ERROR HY000: Field 'i' doesn't have a default value -INSERT INTO t1 SET j = 1, i = DEFAULT; -ERROR HY000: Field 'i' doesn't have a default value -INSERT INTO t1 SET j = 1, i = DEFAULT(i); -ERROR HY000: Field 'i' doesn't have a default value -INSERT INTO t1 VALUES (DEFAULT,1); -ERROR HY000: Field 'i' doesn't have a default value -DROP TABLE t1; -SET @@sql_mode = ''; -CREATE TABLE t1 (i int not null); -INSERT INTO t1 VALUES (); -Warnings: -Warning 1364 Field 'i' doesn't have a default value -INSERT INTO t1 VALUES (DEFAULT); -Warnings: -Warning 1364 Field 'i' doesn't have a default value -INSERT INTO t1 VALUES (DEFAULT(i)); -ERROR HY000: Field 'i' doesn't have a default value -ALTER TABLE t1 ADD j int; -INSERT INTO t1 SET j = 1; -Warnings: -Warning 1364 Field 'i' doesn't have a default value -INSERT INTO t1 SET j = 1, i = DEFAULT; -Warnings: -Warning 1364 Field 'i' doesn't have a default value -INSERT INTO t1 SET j = 1, i = DEFAULT(i); -ERROR HY000: Field 'i' doesn't have a default value -INSERT INTO t1 VALUES (DEFAULT,1); -Warnings: -Warning 1364 Field 'i' doesn't have a default value -DROP TABLE t1; set sql_mode='traditional'; create table t1 (charcol char(255), varcharcol varchar(255), binarycol binary(255), varbinarycol varbinary(255), tinytextcol tinytext, @@ -1232,3 +1191,44 @@ col1 drop procedure t1; drop table t1; set sql_mode=@org_mode; +SET @@sql_mode = 'traditional'; +CREATE TABLE t1 (i int not null); +INSERT INTO t1 VALUES (); +ERROR HY000: Field 'i' doesn't have a default value +INSERT INTO t1 VALUES (DEFAULT); +ERROR HY000: Field 'i' doesn't have a default value +INSERT INTO t1 VALUES (DEFAULT(i)); +ERROR HY000: Field 'i' doesn't have a default value +ALTER TABLE t1 ADD j int; +INSERT INTO t1 SET j = 1; +ERROR HY000: Field 'i' doesn't have a default value +INSERT INTO t1 SET j = 1, i = DEFAULT; +ERROR HY000: Field 'i' doesn't have a default value +INSERT INTO t1 SET j = 1, i = DEFAULT(i); +ERROR HY000: Field 'i' doesn't have a default value +INSERT INTO t1 VALUES (DEFAULT,1); +ERROR HY000: Field 'i' doesn't have a default value +DROP TABLE t1; +SET @@sql_mode = ''; +CREATE TABLE t1 (i int not null); +INSERT INTO t1 VALUES (); +Warnings: +Warning 1364 Field 'i' doesn't have a default value +INSERT INTO t1 VALUES (DEFAULT); +Warnings: +Warning 1364 Field 'i' doesn't have a default value +INSERT INTO t1 VALUES (DEFAULT(i)); +ERROR HY000: Field 'i' doesn't have a default value +ALTER TABLE t1 ADD j int; +INSERT INTO t1 SET j = 1; +Warnings: +Warning 1364 Field 'i' doesn't have a default value +INSERT INTO t1 SET j = 1, i = DEFAULT; +Warnings: +Warning 1364 Field 'i' doesn't have a default value +INSERT INTO t1 SET j = 1, i = DEFAULT(i); +ERROR HY000: Field 'i' doesn't have a default value +INSERT INTO t1 VALUES (DEFAULT,1); +Warnings: +Warning 1364 Field 'i' doesn't have a default value +DROP TABLE t1; |