diff options
Diffstat (limited to 'mysql-test/main/create.result')
| -rw-r--r-- | mysql-test/main/create.result | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/mysql-test/main/create.result b/mysql-test/main/create.result index 12de9bca44e..c80a7aec743 100644 --- a/mysql-test/main/create.result +++ b/mysql-test/main/create.result @@ -528,7 +528,7 @@ t2 CREATE TABLE `t2` ( `ifnull(h,h)` decimal(5,4) DEFAULT NULL, `ifnull(i,i)` year(4) DEFAULT NULL, `ifnull(j,j)` date DEFAULT NULL, - `ifnull(k,k)` timestamp NOT NULL DEFAULT '0000-00-00 00:00:00', + `ifnull(k,k)` timestamp NOT NULL, `ifnull(l,l)` datetime DEFAULT NULL, `ifnull(m,m)` varchar(1) DEFAULT NULL, `ifnull(n,n)` varchar(3) DEFAULT NULL, @@ -1120,7 +1120,7 @@ show create table t1; Table Create Table t1 CREATE TABLE `t1` ( `CHARACTER_SET_NAME` varchar(32) NOT NULL, - `DEFAULT_COLLATE_NAME` varchar(32) NOT NULL, + `DEFAULT_COLLATE_NAME` varchar(64) NOT NULL, `DESCRIPTION` varchar(60) NOT NULL, `MAXLEN` bigint(3) NOT NULL ) ENGINE=MEMORY DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_general_ci @@ -1141,9 +1141,6 @@ SET sql_mode = NO_ZERO_DATE; CREATE TABLE t2(c1 TIMESTAMP, c2 TIMESTAMP DEFAULT 0); ERROR 42000: Invalid default value for 'c2' -CREATE TABLE t2(c1 TIMESTAMP NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP, c2 TIMESTAMP NOT NULL); -ERROR 42000: Invalid default value for 'c2' - # -- Check that NULL column still can be created. CREATE TABLE t2(c1 TIMESTAMP NULL); |