diff options
author | Monty <monty@mariadb.org> | 2015-08-18 00:42:08 +0300 |
---|---|---|
committer | Monty <monty@mariadb.org> | 2015-08-18 11:18:57 +0300 |
commit | 6b20342651bb5207b6c125d2d11b664a1bebcc41 (patch) | |
tree | 2f2e6ca60f3e45239224909eed19b907614f5054 /mysql-test/suite/innodb/r/innodb-index.result | |
parent | 92fd65832727162a003647b4c48344dc9567ce84 (diff) | |
download | mariadb-git-6b20342651bb5207b6c125d2d11b664a1bebcc41.tar.gz |
Ensure that fields declared with NOT NULL doesn't have DEFAULT values if not specified and if not timestamp or auto_increment
In original code, sometimes one got an automatic DEFAULT value in some cases, in other cases not.
For example:
create table t1 (a int primary key) - No default
create table t2 (a int, primary key(a)) - DEFAULT 0
create table t1 SELECT .... - Default for all fields, even if they where defined as NOT NULL
ALTER TABLE ... MODIFY could sometimes add an unexpected DEFAULT value.
The patch is quite big because we had some many test cases that used
CREATE ... SELECT or CREATE ... (...PRIMARY KEY(xxx)) which doesn't have an automatic DEFAULT anymore.
Other things:
- Removed warnings from InnoDB when waiting from semaphore (got this when testing things with --big)
Diffstat (limited to 'mysql-test/suite/innodb/r/innodb-index.result')
-rw-r--r-- | mysql-test/suite/innodb/r/innodb-index.result | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/mysql-test/suite/innodb/r/innodb-index.result b/mysql-test/suite/innodb/r/innodb-index.result index 996bc45f7e2..b151e20d321 100644 --- a/mysql-test/suite/innodb/r/innodb-index.result +++ b/mysql-test/suite/innodb/r/innodb-index.result @@ -528,7 +528,7 @@ info: Records: 0 Duplicates: 0 Warnings: 0 show create table t2; Table Create Table t2 CREATE TABLE `t2` ( - `alpha` int(11) NOT NULL DEFAULT '0', + `alpha` int(11) NOT NULL, `beta` int(11) DEFAULT NULL, `c` int(11) NOT NULL, `d` int(11) DEFAULT NULL, @@ -1166,7 +1166,7 @@ t2 CREATE TABLE `t2` ( show create table t2i; Table Create Table t2i CREATE TABLE `t2i` ( - `a` int(11) NOT NULL DEFAULT '0', + `a` int(11) NOT NULL, `b` char(1) NOT NULL, PRIMARY KEY (`a`,`b`), KEY `t2a` (`a`) @@ -1174,7 +1174,7 @@ t2i CREATE TABLE `t2i` ( show create table t2c; Table Create Table t2c CREATE TABLE `t2c` ( - `a` int(11) NOT NULL DEFAULT '0', + `a` int(11) NOT NULL, `b` char(1) NOT NULL, PRIMARY KEY (`a`,`b`), KEY `t2a` (`a`) |