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/r/case.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/r/case.result')
-rw-r--r-- | mysql-test/r/case.result | 36 |
1 files changed, 18 insertions, 18 deletions
diff --git a/mysql-test/r/case.result b/mysql-test/r/case.result index 3852da5d4b0..81fc152dce7 100644 --- a/mysql-test/r/case.result +++ b/mysql-test/r/case.result @@ -99,18 +99,18 @@ CASE WHEN 1 THEN 0.1e1 else '1' END AS c12 SHOW CREATE TABLE t1; Table Create Table t1 CREATE TABLE `t1` ( - `c1` varchar(1) CHARACTER SET latin1 COLLATE latin1_danish_ci NOT NULL DEFAULT '', - `c2` varchar(1) CHARACTER SET latin1 COLLATE latin1_danish_ci NOT NULL DEFAULT '', - `c3` varchar(1) NOT NULL DEFAULT '', - `c4` varchar(1) NOT NULL DEFAULT '', - `c5` varchar(4) NOT NULL DEFAULT '', - `c6` varchar(4) NOT NULL DEFAULT '', - `c7` decimal(2,1) NOT NULL DEFAULT '0.0', - `c8` decimal(2,1) NOT NULL DEFAULT '0.0', + `c1` varchar(1) CHARACTER SET latin1 COLLATE latin1_danish_ci NOT NULL, + `c2` varchar(1) CHARACTER SET latin1 COLLATE latin1_danish_ci NOT NULL, + `c3` varchar(1) NOT NULL, + `c4` varchar(1) NOT NULL, + `c5` varchar(4) NOT NULL, + `c6` varchar(4) NOT NULL, + `c7` decimal(2,1) NOT NULL, + `c8` decimal(2,1) NOT NULL, `c9` decimal(2,1) DEFAULT NULL, - `c10` double NOT NULL DEFAULT '0', - `c11` double NOT NULL DEFAULT '0', - `c12` varchar(5) NOT NULL DEFAULT '' + `c10` double NOT NULL, + `c11` double NOT NULL, + `c12` varchar(5) NOT NULL ) ENGINE=MyISAM DEFAULT CHARSET=latin1 DROP TABLE t1; SELECT CASE @@ -151,13 +151,13 @@ Note 1003 select coalesce(1) AS `COALESCE(1)`,coalesce(1.0) AS `COALESCE(1.0)`,c SHOW CREATE TABLE t1; Table Create Table t1 CREATE TABLE `t1` ( - `COALESCE(1)` int(1) NOT NULL DEFAULT '0', - `COALESCE(1.0)` decimal(2,1) NOT NULL DEFAULT '0.0', - `COALESCE('a')` varchar(1) NOT NULL DEFAULT '', - `COALESCE(1,1.0)` decimal(2,1) NOT NULL DEFAULT '0.0', - `COALESCE(1,'1')` varchar(1) NOT NULL DEFAULT '', - `COALESCE(1.1,'1')` varchar(4) NOT NULL DEFAULT '', - `COALESCE('a' COLLATE latin1_bin,'b')` varchar(1) CHARACTER SET latin1 COLLATE latin1_bin NOT NULL DEFAULT '' + `COALESCE(1)` int(1) NOT NULL, + `COALESCE(1.0)` decimal(2,1) NOT NULL, + `COALESCE('a')` varchar(1) NOT NULL, + `COALESCE(1,1.0)` decimal(2,1) NOT NULL, + `COALESCE(1,'1')` varchar(1) NOT NULL, + `COALESCE(1.1,'1')` varchar(4) NOT NULL, + `COALESCE('a' COLLATE latin1_bin,'b')` varchar(1) CHARACTER SET latin1 COLLATE latin1_bin NOT NULL ) ENGINE=MyISAM DEFAULT CHARSET=latin1 DROP TABLE t1; CREATE TABLE t1 SELECT IFNULL('a' COLLATE latin1_swedish_ci, 'b' COLLATE latin1_bin); |