diff options
| author | Sergei Golubchik <serg@mariadb.org> | 2022-06-12 22:01:56 +0200 |
|---|---|---|
| committer | Oleksandr Byelkin <sanja@mariadb.com> | 2022-08-10 15:03:22 +0200 |
| commit | 45e0373a7818f137bfbbf5d354c78055cec6c82b (patch) | |
| tree | 64bfc449bb93f2af74176632f180bbfb4dc157a1 | |
| parent | c38b8f49b8cbe43e20d7710b0d291dd92490fced (diff) | |
| download | mariadb-git-45e0373a7818f137bfbbf5d354c78055cec6c82b.tar.gz | |
MDEV-28632 Change default of explicit_defaults_for_timestamp to ON
125 files changed, 876 insertions, 887 deletions
diff --git a/mysql-test/main/check_constraint.result b/mysql-test/main/check_constraint.result index a6480bb6133..7630f5255a0 100644 --- a/mysql-test/main/check_constraint.result +++ b/mysql-test/main/check_constraint.result @@ -284,11 +284,11 @@ drop table t1; # # MDEV-26061 MariaDB server crash at Field::set_default # -create table t1 (d timestamp check (default (d) is true)) as select 1; +create table t1 (d timestamp not null default now() check (default (d) is true)) as select 1; show create table t1; Table Create Table t1 CREATE TABLE `t1` ( - `d` timestamp NOT NULL DEFAULT current_timestamp() ON UPDATE current_timestamp() CHECK (default(`d`) is true), + `d` timestamp NOT NULL DEFAULT current_timestamp() CHECK (default(`d`) is true), `1` int(1) NOT NULL ) ENGINE=MyISAM DEFAULT CHARSET=latin1 drop table t1; diff --git a/mysql-test/main/check_constraint.test b/mysql-test/main/check_constraint.test index 194fdc04399..46a34239270 100644 --- a/mysql-test/main/check_constraint.test +++ b/mysql-test/main/check_constraint.test @@ -212,7 +212,7 @@ drop table t1; --echo # MDEV-26061 MariaDB server crash at Field::set_default --echo # -create table t1 (d timestamp check (default (d) is true)) as select 1; +create table t1 (d timestamp not null default now() check (default (d) is true)) as select 1; show create table t1; drop table t1; diff --git a/mysql-test/main/create.result b/mysql-test/main/create.result index acef8b73074..51a6c5f4eb2 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, @@ -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); diff --git a/mysql-test/main/create.test b/mysql-test/main/create.test index a6364e5217e..eb5090ac79a 100644 --- a/mysql-test/main/create.test +++ b/mysql-test/main/create.test @@ -1055,9 +1055,9 @@ SET sql_mode = NO_ZERO_DATE; --error ER_INVALID_DEFAULT CREATE TABLE t2(c1 TIMESTAMP, c2 TIMESTAMP DEFAULT 0); ---echo ---error ER_INVALID_DEFAULT -CREATE TABLE t2(c1 TIMESTAMP NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP, c2 TIMESTAMP NOT NULL); +#--echo +#--error ER_INVALID_DEFAULT +#CREATE TABLE t2(c1 TIMESTAMP NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP, c2 TIMESTAMP NOT NULL); --echo --echo # -- Check that NULL column still can be created. diff --git a/mysql-test/main/ctype_utf8.result b/mysql-test/main/ctype_utf8.result index c75bdfd0248..dbc71ab7b1f 100644 --- a/mysql-test/main/ctype_utf8.result +++ b/mysql-test/main/ctype_utf8.result @@ -6130,7 +6130,7 @@ DROP TABLE t1, t2; # MDEV-8630 Datetime value dropped in "INSERT ... SELECT ... ON DUPLICATE KEY" # SET NAMES utf8; -CREATE TABLE t1 (id2 int, ts timestamp); +CREATE TABLE t1 (id2 int, ts timestamp not null); INSERT INTO t1 VALUES (1,'2012-06-11 15:17:34'),(2,'2012-06-11 15:18:24'); CREATE TABLE t2 AS SELECT COALESCE(ts, 0) AS c0, diff --git a/mysql-test/main/ctype_utf8.test b/mysql-test/main/ctype_utf8.test index 5c589f55672..0010cba39bd 100644 --- a/mysql-test/main/ctype_utf8.test +++ b/mysql-test/main/ctype_utf8.test @@ -1665,7 +1665,7 @@ DROP TABLE t1, t2; --echo # MDEV-8630 Datetime value dropped in "INSERT ... SELECT ... ON DUPLICATE KEY" --echo # SET NAMES utf8; -CREATE TABLE t1 (id2 int, ts timestamp); +CREATE TABLE t1 (id2 int, ts timestamp not null); INSERT INTO t1 VALUES (1,'2012-06-11 15:17:34'),(2,'2012-06-11 15:18:24'); CREATE TABLE t2 AS SELECT COALESCE(ts, 0) AS c0, diff --git a/mysql-test/main/default.result b/mysql-test/main/default.result index d840731c79d..2d94c0695a0 100644 --- a/mysql-test/main/default.result +++ b/mysql-test/main/default.result @@ -371,7 +371,7 @@ create or replace table t1 (param_list blob DEFAULT "" NOT NULL); drop table t1; create table t1 (a int); insert into t1 values(-1); -alter table t1 add b int default 1, add c int default -1, add d int default (1+1), add e timestamp; +alter table t1 add b int default 1, add c int default -1, add d int default (1+1), add e timestamp not null default now(); select a,b,c,d,e from t1; a b c d e -1 1 -1 2 2001-01-01 10:20:30 @@ -388,7 +388,7 @@ t1 CREATE TABLE `t1` ( `b` int(11) DEFAULT 1, `c` int(11) DEFAULT -1, `d` int(11) DEFAULT (1 + 1), - `e` timestamp NOT NULL DEFAULT current_timestamp() ON UPDATE current_timestamp(), + `e` timestamp NOT NULL DEFAULT current_timestamp(), `f` int(11) DEFAULT (1 + 1 + 1), `g` int(11) NOT NULL DEFAULT (1 + 1 + 1 + 1), `h` int(11) DEFAULT (2 + 2 + 2 + 2) @@ -401,7 +401,7 @@ t2 CREATE TABLE `t2` ( `b` int(11) DEFAULT 1, `c` int(11) DEFAULT -1, `d` int(11) DEFAULT (1 + 1), - `e` timestamp NOT NULL DEFAULT current_timestamp() ON UPDATE current_timestamp(), + `e` timestamp NOT NULL DEFAULT current_timestamp(), `f` int(11) DEFAULT (1 + 1 + 1), `g` int(11) NOT NULL DEFAULT (1 + 1 + 1 + 1), `h` int(11) DEFAULT (2 + 2 + 2 + 2) @@ -1067,7 +1067,7 @@ CREATE TABLE t1 (a TIMESTAMP DEFAULT COALESCE(CURRENT_TIMESTAMP)); SHOW CREATE TABLE t1; Table Create Table t1 CREATE TABLE `t1` ( - `a` timestamp NOT NULL DEFAULT coalesce(current_timestamp()) + `a` timestamp NULL DEFAULT coalesce(current_timestamp()) ) ENGINE=MyISAM DEFAULT CHARSET=latin1 DROP TABLE t1; CREATE TABLE t1 (a DATE DEFAULT COALESCE(CURRENT_DATE)); @@ -1091,8 +1091,8 @@ b TIMESTAMP DEFAULT COALESCE(CURRENT_TIMESTAMP(6)) SHOW CREATE TABLE t1; Table Create Table t1 CREATE TABLE `t1` ( - `a` timestamp NOT NULL DEFAULT current_timestamp(), - `b` timestamp NOT NULL DEFAULT coalesce(current_timestamp(6)) + `a` timestamp NULL DEFAULT current_timestamp(), + `b` timestamp NULL DEFAULT coalesce(current_timestamp(6)) ) ENGINE=MyISAM DEFAULT CHARSET=latin1 INSERT INTO t1 VALUES (); SELECT CURRENT_TIMESTAMP(6); @@ -1525,8 +1525,8 @@ CREATE TABLE t1 (a TIMESTAMP DEFAULT NOW(), b TIMESTAMP DEFAULT UTC_TIMESTAMP()) SHOW CREATE TABLE t1; Table Create Table t1 CREATE TABLE `t1` ( - `a` timestamp NOT NULL DEFAULT current_timestamp(), - `b` timestamp NOT NULL DEFAULT utc_timestamp() + `a` timestamp NULL DEFAULT current_timestamp(), + `b` timestamp NULL DEFAULT utc_timestamp() ) ENGINE=MyISAM DEFAULT CHARSET=latin1 INSERT INTO t1 VALUES (); SELECT * FROM t1; @@ -1538,9 +1538,9 @@ CREATE TABLE t1 (a TIMESTAMP(6) DEFAULT SYSDATE(6), s INT, b TIMESTAMP(6) DEFAUL SHOW CREATE TABLE t1; Table Create Table t1 CREATE TABLE `t1` ( - `a` timestamp(6) NOT NULL DEFAULT sysdate(6), + `a` timestamp(6) NULL DEFAULT sysdate(6), `s` int(11) DEFAULT NULL, - `b` timestamp(6) NOT NULL DEFAULT sysdate(6) + `b` timestamp(6) NULL DEFAULT sysdate(6) ) ENGINE=MyISAM DEFAULT CHARSET=latin1 INSERT INTO t1 VALUES (DEFAULT(a), SLEEP(0.1), DEFAULT(b)); SELECT b>a FROM t1; @@ -1553,7 +1553,7 @@ SHOW CREATE TABLE t1; Table Create Table t1 CREATE TABLE `t1` ( `a` int(11) DEFAULT NULL, - `b` timestamp NOT NULL DEFAULT from_unixtime(`a`) + `b` timestamp NULL DEFAULT from_unixtime(`a`) ) ENGINE=MyISAM DEFAULT CHARSET=latin1 INSERT INTO t1 VALUES (1447430881, DEFAULT); SELECT * FROM t1; @@ -1565,8 +1565,8 @@ CREATE TABLE t1 (a TIMESTAMP, b TIMESTAMP DEFAULT CONVERT_TZ(a, '-10:00', '+10:0 SHOW CREATE TABLE t1; Table Create Table t1 CREATE TABLE `t1` ( - `a` timestamp NOT NULL DEFAULT current_timestamp() ON UPDATE current_timestamp(), - `b` timestamp NOT NULL DEFAULT convert_tz(`a`,'-10:00','+10:00') + `a` timestamp NULL DEFAULT NULL, + `b` timestamp NULL DEFAULT convert_tz(`a`,'-10:00','+10:00') ) ENGINE=MyISAM DEFAULT CHARSET=latin1 INSERT INTO t1 VALUES ('2001-01-01 10:20:30', DEFAULT); SELECT * FROM t1; diff --git a/mysql-test/main/default.test b/mysql-test/main/default.test index 3064209a4a2..26fc2186533 100644 --- a/mysql-test/main/default.test +++ b/mysql-test/main/default.test @@ -287,7 +287,7 @@ drop table t1; create table t1 (a int); insert into t1 values(-1); -alter table t1 add b int default 1, add c int default -1, add d int default (1+1), add e timestamp; +alter table t1 add b int default 1, add c int default -1, add d int default (1+1), add e timestamp not null default now(); select a,b,c,d,e from t1; insert into t1 values(10,10,10,10,0); alter table t1 add f int default (1+1+1) null, add g int default (1+1+1+1) not null,add h int default (2+2+2+2); diff --git a/mysql-test/main/func_default.result b/mysql-test/main/func_default.result index 55efbda546d..c1de22f351d 100644 --- a/mysql-test/main/func_default.result +++ b/mysql-test/main/func_default.result @@ -175,7 +175,7 @@ default(a) = now() 1 drop view v1, v2; drop table t1; -create table t1 (v1 timestamp) select 'x'; +create table t1 (v1 timestamp not null default now() on update now()) select 'x'; show create table t1; Table Create Table t1 CREATE TABLE `t1` ( diff --git a/mysql-test/main/func_default.test b/mysql-test/main/func_default.test index d2099d3ef4c..3cb88b7b597 100644 --- a/mysql-test/main/func_default.test +++ b/mysql-test/main/func_default.test @@ -151,7 +151,7 @@ select default(a) = now() from v2; drop view v1, v2; drop table t1; -create table t1 (v1 timestamp) select 'x'; +create table t1 (v1 timestamp not null default now() on update now()) select 'x'; show create table t1; select default(v1) from (select v1 from t1) dt; select default(v1) from (select v1 from t1 group by v1) dt; diff --git a/mysql-test/main/func_hybrid_type.result b/mysql-test/main/func_hybrid_type.result index 7c1b5fef61c..36c8d3d4dcc 100644 --- a/mysql-test/main/func_hybrid_type.result +++ b/mysql-test/main/func_hybrid_type.result @@ -2310,15 +2310,15 @@ LEAST(b, b) AS least____b_b, GREATEST(b, b) AS greatest_b_b FROM t1; Catalog Database Table Table_alias Column Column_alias Type Length Max length Is_null Flags Decimals Charsetnr -def test t1 t1 a ___________a 7 19 19 N 9377 0 63 +def test t1 t1 a ___________a 7 19 19 Y 160 0 63 def case_______a 7 19 19 Y 128 0 63 -def case_____a_a 7 19 19 N 129 0 63 -def coalesce___a 7 19 19 N 129 0 63 -def coalesce_a_a 7 19 19 N 129 0 63 -def if_______a_a 7 19 19 N 129 0 63 -def ifnull___a_a 7 19 19 N 129 0 63 -def least____a_a 7 19 19 N 129 0 63 -def greatest_a_a 7 19 19 N 129 0 63 +def case_____a_a 7 19 19 Y 128 0 63 +def coalesce___a 7 19 19 Y 128 0 63 +def coalesce_a_a 7 19 19 Y 128 0 63 +def if_______a_a 7 19 19 Y 128 0 63 +def ifnull___a_a 7 19 19 Y 128 0 63 +def least____a_a 7 19 19 Y 128 0 63 +def greatest_a_a 7 19 19 Y 128 0 63 def test t1 t1 b ___________b 11 10 8 Y 128 0 63 def case_______b 11 10 8 Y 128 0 63 def case_____b_b 11 10 8 Y 128 0 63 @@ -2368,7 +2368,7 @@ def coalesce_b_a 12 19 19 Y 128 0 63 def if_______a_b 12 19 19 Y 128 0 63 def if_______b_a 12 19 19 Y 128 0 63 def ifnull___a_b 12 19 19 Y 128 0 63 -def ifnull___b_a 12 19 19 N 129 0 63 +def ifnull___b_a 12 19 19 Y 128 0 63 def least____a_b 12 19 19 Y 128 0 63 def least____b_a 12 19 19 Y 128 0 63 def greatest_a_b 12 19 19 Y 128 0 63 @@ -2409,15 +2409,15 @@ FROM t1; SHOW CREATE TABLE t2; Table Create Table t2 CREATE TABLE `t2` ( - `___________a` timestamp NOT NULL DEFAULT current_timestamp() ON UPDATE current_timestamp(), + `___________a` timestamp NULL DEFAULT NULL, `case_______a` timestamp NULL DEFAULT NULL, - `case_____a_a` timestamp NOT NULL DEFAULT '0000-00-00 00:00:00', - `coalesce___a` timestamp NOT NULL DEFAULT '0000-00-00 00:00:00', - `coalesce_a_a` timestamp NOT NULL DEFAULT '0000-00-00 00:00:00', - `if_______a_a` timestamp NOT NULL DEFAULT '0000-00-00 00:00:00', - `ifnull___a_a` timestamp NOT NULL DEFAULT '0000-00-00 00:00:00', - `least____a_a` timestamp NOT NULL DEFAULT '0000-00-00 00:00:00', - `greatest_a_a` timestamp NOT NULL DEFAULT '0000-00-00 00:00:00', + `case_____a_a` timestamp NULL DEFAULT NULL, + `coalesce___a` timestamp NULL DEFAULT NULL, + `coalesce_a_a` timestamp NULL DEFAULT NULL, + `if_______a_a` timestamp NULL DEFAULT NULL, + `ifnull___a_a` timestamp NULL DEFAULT NULL, + `least____a_a` timestamp NULL DEFAULT NULL, + `greatest_a_a` timestamp NULL DEFAULT NULL, `___________b` time DEFAULT NULL, `case_______b` time DEFAULT NULL, `case_____b_b` time DEFAULT NULL, @@ -2455,7 +2455,7 @@ t2 CREATE TABLE `t2` ( `if_______a_b` datetime DEFAULT NULL, `if_______b_a` datetime DEFAULT NULL, `ifnull___a_b` datetime DEFAULT NULL, - `ifnull___b_a` datetime NOT NULL, + `ifnull___b_a` datetime DEFAULT NULL, `least____a_b` datetime DEFAULT NULL, `least____b_a` datetime DEFAULT NULL, `greatest_a_b` datetime DEFAULT NULL, @@ -3058,12 +3058,12 @@ CREATE TABLE t1 (a TIMESTAMP); INSERT INTO t1 VALUES ('2010-01-01 10:20:30'); SELECT GREATEST(a,a) FROM t1; Catalog Database Table Table_alias Column Column_alias Type Length Max length Is_null Flags Decimals Charsetnr -def GREATEST(a,a) 7 19 19 N 129 0 63 +def GREATEST(a,a) 7 19 19 Y 128 0 63 GREATEST(a,a) 2010-01-01 10:20:30 SELECT COALESCE(a,a) FROM t1; Catalog Database Table Table_alias Column Column_alias Type Length Max length Is_null Flags Decimals Charsetnr -def COALESCE(a,a) 7 19 19 N 129 0 63 +def COALESCE(a,a) 7 19 19 Y 128 0 63 COALESCE(a,a) 2010-01-01 10:20:30 DROP TABLE t1; @@ -3072,7 +3072,7 @@ CREATE TABLE t2 AS SELECT LEAST(a,a),LEAST(b,b),LEAST(a,b) FROM t1; SHOW CREATE TABLE t2; Table Create Table t2 CREATE TABLE `t2` ( - `LEAST(a,a)` timestamp NOT NULL DEFAULT '0000-00-00 00:00:00', + `LEAST(a,a)` timestamp NULL DEFAULT NULL, `LEAST(b,b)` datetime DEFAULT NULL, `LEAST(a,b)` datetime DEFAULT NULL ) ENGINE=MyISAM DEFAULT CHARSET=latin1 diff --git a/mysql-test/main/func_math.result b/mysql-test/main/func_math.result index befff56c4da..5c2c9bae12c 100644 --- a/mysql-test/main/func_math.result +++ b/mysql-test/main/func_math.result @@ -3648,7 +3648,7 @@ DROP TABLE t1,t2; # # MDEV-21278 Assertion `is_unsigned() == attr.unsigned_flag' or Assertion `field.is_sane()' failed # -CREATE TABLE t1 (a TIMESTAMP); +CREATE TABLE t1 (a TIMESTAMP NOT NULL DEFAULT NOW()); INSERT INTO t1 VALUES (NULL),(NULL); SET SESSION SQL_MODE= 'NO_UNSIGNED_SUBTRACTION'; SELECT DISTINCT UUID_SHORT() - a FROM t1; @@ -3663,7 +3663,7 @@ t2 CREATE TABLE `t2` ( ) ENGINE=MyISAM DEFAULT CHARSET=latin1 DROP TABLE t2, t1; SET sql_mode=DEFAULT; -CREATE TABLE t1 (a TIMESTAMP); +CREATE TABLE t1 (a TIMESTAMP NOT NULL DEFAULT NOW()); INSERT INTO t1 VALUES (NULL),(NULL); SET SESSION SQL_MODE= 'NO_UNSIGNED_SUBTRACTION'; SELECT UUID_SHORT() - a FROM t1; diff --git a/mysql-test/main/func_math.test b/mysql-test/main/func_math.test index b30eda7eb94..69d9e746ec0 100644 --- a/mysql-test/main/func_math.test +++ b/mysql-test/main/func_math.test @@ -1907,7 +1907,7 @@ DROP TABLE t1,t2; --echo # MDEV-21278 Assertion `is_unsigned() == attr.unsigned_flag' or Assertion `field.is_sane()' failed --echo # -CREATE TABLE t1 (a TIMESTAMP); +CREATE TABLE t1 (a TIMESTAMP NOT NULL DEFAULT NOW()); INSERT INTO t1 VALUES (NULL),(NULL); SET SESSION SQL_MODE= 'NO_UNSIGNED_SUBTRACTION'; --replace_column 1 xxx @@ -1917,7 +1917,7 @@ SHOW CREATE TABLE t2; DROP TABLE t2, t1; SET sql_mode=DEFAULT; -CREATE TABLE t1 (a TIMESTAMP); +CREATE TABLE t1 (a TIMESTAMP NOT NULL DEFAULT NOW()); INSERT INTO t1 VALUES (NULL),(NULL); SET SESSION SQL_MODE= 'NO_UNSIGNED_SUBTRACTION'; --replace_column 1 xxx diff --git a/mysql-test/main/join_cache.result b/mysql-test/main/join_cache.result index 10ed8960b64..b32a278d3a1 100644 --- a/mysql-test/main/join_cache.result +++ b/mysql-test/main/join_cache.result @@ -2952,7 +2952,7 @@ metaid int NOT NULL default '0', formatid int NOT NULL default '0', status int default NULL, path varchar(100) NOT NULL default '', -datemodified timestamp NOT NULL , +datemodified timestamp NOT NULL default now(), resourcetype int NOT NULL default '1', parameters text, signature int default NULL, diff --git a/mysql-test/main/join_cache.test b/mysql-test/main/join_cache.test index 4b659345db4..f1546bbefa8 100644 --- a/mysql-test/main/join_cache.test +++ b/mysql-test/main/join_cache.test @@ -1101,7 +1101,7 @@ CREATE TABLE t3( formatid int NOT NULL default '0', status int default NULL, path varchar(100) NOT NULL default '', - datemodified timestamp NOT NULL , + datemodified timestamp NOT NULL default now(), resourcetype int NOT NULL default '1', parameters text, signature int default NULL, diff --git a/mysql-test/main/mysqlbinlog-innodb.result b/mysql-test/main/mysqlbinlog-innodb.result index be34c273019..6f0b4dd40b6 100644 --- a/mysql-test/main/mysqlbinlog-innodb.result +++ b/mysql-test/main/mysqlbinlog-innodb.result @@ -29,7 +29,7 @@ START TRANSACTION use `test`/*!*/; SET TIMESTAMP=1000000000/*!*/; SET @@session.pseudo_thread_id=999999999/*!*/; -SET @@session.foreign_key_checks=1, @@session.sql_auto_is_null=0, @@session.unique_checks=1, @@session.autocommit=1, @@session.check_constraint_checks=1, @@session.sql_if_exists=0, @@session.explicit_defaults_for_timestamp=0/*!*/; +SET @@session.foreign_key_checks=1, @@session.sql_auto_is_null=0, @@session.unique_checks=1, @@session.autocommit=1, @@session.check_constraint_checks=1, @@session.sql_if_exists=0, @@session.explicit_defaults_for_timestamp=1/*!*/; SET @@session.sql_mode=#/*!*/; SET @@session.auto_increment_increment=1, @@session.auto_increment_offset=1/*!*/; /*!\C latin1 *//*!*/; @@ -60,7 +60,7 @@ START TRANSACTION use `foo`/*!*/; SET TIMESTAMP=1000000000/*!*/; SET @@session.pseudo_thread_id=999999999/*!*/; -SET @@session.foreign_key_checks=1, @@session.sql_auto_is_null=0, @@session.unique_checks=1, @@session.autocommit=1, @@session.check_constraint_checks=1, @@session.sql_if_exists=0, @@session.explicit_defaults_for_timestamp=0/*!*/; +SET @@session.foreign_key_checks=1, @@session.sql_auto_is_null=0, @@session.unique_checks=1, @@session.autocommit=1, @@session.check_constraint_checks=1, @@session.sql_if_exists=0, @@session.explicit_defaults_for_timestamp=1/*!*/; SET @@session.sql_mode=#/*!*/; SET @@session.auto_increment_increment=1, @@session.auto_increment_offset=1/*!*/; /*!\C latin1 *//*!*/; diff --git a/mysql-test/main/mysqlbinlog.result b/mysql-test/main/mysqlbinlog.result index 727558a8ce9..c476c3c65e2 100644 --- a/mysql-test/main/mysqlbinlog.result +++ b/mysql-test/main/mysqlbinlog.result @@ -22,7 +22,7 @@ ROLLBACK/*!*/; use `test`/*!*/; SET TIMESTAMP=1000000000/*!*/; SET @@session.pseudo_thread_id=999999999/*!*/; -SET @@session.foreign_key_checks=1, @@session.sql_auto_is_null=0, @@session.unique_checks=1, @@session.autocommit=1, @@session.check_constraint_checks=1, @@session.sql_if_exists=0, @@session.explicit_defaults_for_timestamp=0/*!*/; +SET @@session.foreign_key_checks=1, @@session.sql_auto_is_null=0, @@session.unique_checks=1, @@session.autocommit=1, @@session.check_constraint_checks=1, @@session.sql_if_exists=0, @@session.explicit_defaults_for_timestamp=1/*!*/; SET @@session.sql_mode=#/*!*/; SET @@session.auto_increment_increment=1, @@session.auto_increment_offset=1/*!*/; /*!\C latin1 *//*!*/; @@ -102,7 +102,7 @@ START TRANSACTION use `test`/*!*/; SET TIMESTAMP=1000000000/*!*/; SET @@session.pseudo_thread_id=999999999/*!*/; -SET @@session.foreign_key_checks=1, @@session.sql_auto_is_null=0, @@session.unique_checks=1, @@session.autocommit=1, @@session.check_constraint_checks=1, @@session.sql_if_exists=0, @@session.explicit_defaults_for_timestamp=0/*!*/; +SET @@session.foreign_key_checks=1, @@session.sql_auto_is_null=0, @@session.unique_checks=1, @@session.autocommit=1, @@session.check_constraint_checks=1, @@session.sql_if_exists=0, @@session.explicit_defaults_for_timestamp=1/*!*/; SET @@session.sql_mode=#/*!*/; SET @@session.auto_increment_increment=1, @@session.auto_increment_offset=1/*!*/; /*!\C latin1 *//*!*/; @@ -138,7 +138,7 @@ START TRANSACTION /*!*/; SET TIMESTAMP=1000000000/*!*/; SET @@session.pseudo_thread_id=999999999/*!*/; -SET @@session.foreign_key_checks=1, @@session.sql_auto_is_null=0, @@session.unique_checks=1, @@session.autocommit=1, @@session.check_constraint_checks=1, @@session.sql_if_exists=0, @@session.explicit_defaults_for_timestamp=0/*!*/; +SET @@session.foreign_key_checks=1, @@session.sql_auto_is_null=0, @@session.unique_checks=1, @@session.autocommit=1, @@session.check_constraint_checks=1, @@session.sql_if_exists=0, @@session.explicit_defaults_for_timestamp=1/*!*/; SET @@session.sql_mode=#/*!*/; SET @@session.auto_increment_increment=1, @@session.auto_increment_offset=1/*!*/; /*!\C latin1 *//*!*/; @@ -189,7 +189,7 @@ START TRANSACTION use `test`/*!*/; SET TIMESTAMP=1000000000/*!*/; SET @@session.pseudo_thread_id=999999999/*!*/; -SET @@session.foreign_key_checks=1, @@session.sql_auto_is_null=0, @@session.unique_checks=1, @@session.autocommit=1, @@session.check_constraint_checks=1, @@session.sql_if_exists=0, @@session.explicit_defaults_for_timestamp=0/*!*/; +SET @@session.foreign_key_checks=1, @@session.sql_auto_is_null=0, @@session.unique_checks=1, @@session.autocommit=1, @@session.check_constraint_checks=1, @@session.sql_if_exists=0, @@session.explicit_defaults_for_timestamp=1/*!*/; SET @@session.sql_mode=#/*!*/; SET @@session.auto_increment_increment=1, @@session.auto_increment_offset=1/*!*/; /*!\C latin1 *//*!*/; @@ -216,7 +216,7 @@ ROLLBACK/*!*/; use `test`/*!*/; SET TIMESTAMP=1000000000/*!*/; SET @@session.pseudo_thread_id=999999999/*!*/; -SET @@session.foreign_key_checks=1, @@session.sql_auto_is_null=0, @@session.unique_checks=1, @@session.autocommit=1, @@session.check_constraint_checks=1, @@session.sql_if_exists=0, @@session.explicit_defaults_for_timestamp=0/*!*/; +SET @@session.foreign_key_checks=1, @@session.sql_auto_is_null=0, @@session.unique_checks=1, @@session.autocommit=1, @@session.check_constraint_checks=1, @@session.sql_if_exists=0, @@session.explicit_defaults_for_timestamp=1/*!*/; SET @@session.sql_mode=#/*!*/; SET @@session.auto_increment_increment=1, @@session.auto_increment_offset=1/*!*/; /*!\C latin1 *//*!*/; @@ -296,7 +296,7 @@ START TRANSACTION use `test`/*!*/; SET TIMESTAMP=1000000000/*!*/; SET @@session.pseudo_thread_id=999999999/*!*/; -SET @@session.foreign_key_checks=1, @@session.sql_auto_is_null=0, @@session.unique_checks=1, @@session.autocommit=1, @@session.check_constraint_checks=1, @@session.sql_if_exists=0, @@session.explicit_defaults_for_timestamp=0/*!*/; +SET @@session.foreign_key_checks=1, @@session.sql_auto_is_null=0, @@session.unique_checks=1, @@session.autocommit=1, @@session.check_constraint_checks=1, @@session.sql_if_exists=0, @@session.explicit_defaults_for_timestamp=1/*!*/; SET @@session.sql_mode=#/*!*/; SET @@session.auto_increment_increment=1, @@session.auto_increment_offset=1/*!*/; /*!\C latin1 *//*!*/; @@ -332,7 +332,7 @@ START TRANSACTION /*!*/; SET TIMESTAMP=1000000000/*!*/; SET @@session.pseudo_thread_id=999999999/*!*/; -SET @@session.foreign_key_checks=1, @@session.sql_auto_is_null=0, @@session.unique_checks=1, @@session.autocommit=1, @@session.check_constraint_checks=1, @@session.sql_if_exists=0, @@session.explicit_defaults_for_timestamp=0/*!*/; +SET @@session.foreign_key_checks=1, @@session.sql_auto_is_null=0, @@session.unique_checks=1, @@session.autocommit=1, @@session.check_constraint_checks=1, @@session.sql_if_exists=0, @@session.explicit_defaults_for_timestamp=1/*!*/; SET @@session.sql_mode=#/*!*/; SET @@session.auto_increment_increment=1, @@session.auto_increment_offset=1/*!*/; /*!\C latin1 *//*!*/; @@ -383,7 +383,7 @@ START TRANSACTION use `test`/*!*/; SET TIMESTAMP=1000000000/*!*/; SET @@session.pseudo_thread_id=999999999/*!*/; -SET @@session.foreign_key_checks=1, @@session.sql_auto_is_null=0, @@session.unique_checks=1, @@session.autocommit=1, @@session.check_constraint_checks=1, @@session.sql_if_exists=0, @@session.explicit_defaults_for_timestamp=0/*!*/; +SET @@session.foreign_key_checks=1, @@session.sql_auto_is_null=0, @@session.unique_checks=1, @@session.autocommit=1, @@session.check_constraint_checks=1, @@session.sql_if_exists=0, @@session.explicit_defaults_for_timestamp=1/*!*/; SET @@session.sql_mode=#/*!*/; SET @@session.auto_increment_increment=1, @@session.auto_increment_offset=1/*!*/; /*!\C latin1 *//*!*/; @@ -492,7 +492,7 @@ DELIMITER /*!*/; use `test`/*!*/; SET TIMESTAMP=1000000000/*!*/; SET @@session.pseudo_thread_id=999999999/*!*/; -SET @@session.foreign_key_checks=1, @@session.sql_auto_is_null=0, @@session.unique_checks=1, @@session.autocommit=1, @@session.check_constraint_checks=1, @@session.sql_if_exists=0, @@session.explicit_defaults_for_timestamp=0/*!*/; +SET @@session.foreign_key_checks=1, @@session.sql_auto_is_null=0, @@session.unique_checks=1, @@session.autocommit=1, @@session.check_constraint_checks=1, @@session.sql_if_exists=0, @@session.explicit_defaults_for_timestamp=1/*!*/; SET @@session.sql_mode=#/*!*/; SET @@session.auto_increment_increment=1, @@session.auto_increment_offset=1/*!*/; /*!\C latin1 *//*!*/; @@ -544,7 +544,7 @@ DELIMITER /*!*/; use `test`/*!*/; SET TIMESTAMP=1000000000/*!*/; SET @@session.pseudo_thread_id=999999999/*!*/; -SET @@session.foreign_key_checks=1, @@session.sql_auto_is_null=0, @@session.unique_checks=1, @@session.autocommit=1, @@session.check_constraint_checks=1, @@session.sql_if_exists=0, @@session.explicit_defaults_for_timestamp=0/*!*/; +SET @@session.foreign_key_checks=1, @@session.sql_auto_is_null=0, @@session.unique_checks=1, @@session.autocommit=1, @@session.check_constraint_checks=1, @@session.sql_if_exists=0, @@session.explicit_defaults_for_timestamp=1/*!*/; SET @@session.sql_mode=#/*!*/; SET @@session.auto_increment_increment=1, @@session.auto_increment_offset=1/*!*/; /*!\C latin1 *//*!*/; diff --git a/mysql-test/main/mysqlbinlog_row_compressed.result b/mysql-test/main/mysqlbinlog_row_compressed.result index a6846f245ff..ca815a518c7 100644 --- a/mysql-test/main/mysqlbinlog_row_compressed.result +++ b/mysql-test/main/mysqlbinlog_row_compressed.result @@ -33,7 +33,7 @@ ROLLBACK/*!*/; use `test`/*!*/; SET TIMESTAMP=X/*!*/; SET @@session.pseudo_thread_id=5/*!*/; -SET @@session.foreign_key_checks=1, @@session.sql_auto_is_null=0, @@session.unique_checks=1, @@session.autocommit=1, @@session.check_constraint_checks=1, @@session.sql_if_exists=0, @@session.explicit_defaults_for_timestamp=0/*!*/; +SET @@session.foreign_key_checks=1, @@session.sql_auto_is_null=0, @@session.unique_checks=1, @@session.autocommit=1, @@session.check_constraint_checks=1, @@session.sql_if_exists=0, @@session.explicit_defaults_for_timestamp=1/*!*/; SET @@session.sql_mode=#/*!*/; SET @@session.auto_increment_increment=1, @@session.auto_increment_offset=1/*!*/; /*!\C latin1 *//*!*/; diff --git a/mysql-test/main/mysqlbinlog_row_minimal.result b/mysql-test/main/mysqlbinlog_row_minimal.result index 99d5757be8d..4d9ca93012b 100644 --- a/mysql-test/main/mysqlbinlog_row_minimal.result +++ b/mysql-test/main/mysqlbinlog_row_minimal.result @@ -31,7 +31,7 @@ ROLLBACK/*!*/; use `test`/*!*/; SET TIMESTAMP=X/*!*/; SET @@session.pseudo_thread_id=5/*!*/; -SET @@session.foreign_key_checks=1, @@session.sql_auto_is_null=0, @@session.unique_checks=1, @@session.autocommit=1, @@session.check_constraint_checks=1, @@session.sql_if_exists=0, @@session.explicit_defaults_for_timestamp=0/*!*/; +SET @@session.foreign_key_checks=1, @@session.sql_auto_is_null=0, @@session.unique_checks=1, @@session.autocommit=1, @@session.check_constraint_checks=1, @@session.sql_if_exists=0, @@session.explicit_defaults_for_timestamp=1/*!*/; SET @@session.sql_mode=#/*!*/; SET @@session.auto_increment_increment=1, @@session.auto_increment_offset=1/*!*/; /*!\C latin1 *//*!*/; @@ -397,7 +397,7 @@ START TRANSACTION #<date> server id 1 end_log_pos END_LOG_POS CRC32 XXX Query thread_id=TID exec_time=x error_code=0 xid=<xid> SET TIMESTAMP=X/*!*/; SET @@session.pseudo_thread_id=TID/*!*/; -SET @@session.foreign_key_checks=1, @@session.sql_auto_is_null=0, @@session.unique_checks=1, @@session.autocommit=1, @@session.check_constraint_checks=1, @@session.sql_if_exists=0, @@session.explicit_defaults_for_timestamp=0/*!*/; +SET @@session.foreign_key_checks=1, @@session.sql_auto_is_null=0, @@session.unique_checks=1, @@session.autocommit=1, @@session.check_constraint_checks=1, @@session.sql_if_exists=0, @@session.explicit_defaults_for_timestamp=1/*!*/; SET @@session.sql_mode=#/*!*/; SET @@session.auto_increment_increment=1, @@session.auto_increment_offset=1/*!*/; /*!\C latin1 *//*!*/; diff --git a/mysql-test/main/mysqlbinlog_stmt_compressed.result b/mysql-test/main/mysqlbinlog_stmt_compressed.result index 7e709eeef2c..5f3e82648c6 100644 --- a/mysql-test/main/mysqlbinlog_stmt_compressed.result +++ b/mysql-test/main/mysqlbinlog_stmt_compressed.result @@ -33,7 +33,7 @@ ROLLBACK/*!*/; use `test`/*!*/; SET TIMESTAMP=X/*!*/; SET @@session.pseudo_thread_id=5/*!*/; -SET @@session.foreign_key_checks=1, @@session.sql_auto_is_null=0, @@session.unique_checks=1, @@session.autocommit=1, @@session.check_constraint_checks=1, @@session.sql_if_exists=0, @@session.explicit_defaults_for_timestamp=0/*!*/; +SET @@session.foreign_key_checks=1, @@session.sql_auto_is_null=0, @@session.unique_checks=1, @@session.autocommit=1, @@session.check_constraint_checks=1, @@session.sql_if_exists=0, @@session.explicit_defaults_for_timestamp=1/*!*/; SET @@session.sql_mode=#/*!*/; SET @@session.auto_increment_increment=1, @@session.auto_increment_offset=1/*!*/; /*!\C latin1 *//*!*/; diff --git a/mysql-test/main/mysqld--help.result b/mysql-test/main/mysqld--help.result index 5412d1710f7..c92c1cd3cd2 100644 --- a/mysql-test/main/mysqld--help.result +++ b/mysql-test/main/mysqld--help.result @@ -288,6 +288,7 @@ The following specify which files/extra groups are read (specified before remain columns as NULL with DEFAULT NULL attribute, Without this option, TIMESTAMP columns are NOT NULL and have implicit DEFAULT clauses. + (Defaults to on; use --skip-explicit-defaults-for-timestamp to disable.) --external-locking Use system (external) locking (disabled by default). With this option enabled you can run myisamchk to test (not repair) tables while the MySQL server is running. @@ -1548,7 +1549,7 @@ eq-range-index-dive-limit 200 event-scheduler OFF expensive-subquery-limit 100 expire-logs-days 0 -explicit-defaults-for-timestamp FALSE +explicit-defaults-for-timestamp TRUE external-locking FALSE extra-max-connections 1 extra-port 0 diff --git a/mysql-test/main/old-mode.result b/mysql-test/main/old-mode.result index e0a3412bbdf..44e8f5bfece 100644 --- a/mysql-test/main/old-mode.result +++ b/mysql-test/main/old-mode.result @@ -129,7 +129,7 @@ DROP TABLE t1; SET @@global.mysql56_temporal_format=DEFAULT; set time_zone='Europe/Moscow'; set global mysql56_temporal_format=false; -create table t1 (a timestamp); +create table t1 (a timestamp not null default now()); set timestamp=1288477526; insert t1 values (null); insert t1 values (); @@ -158,7 +158,7 @@ a unix_timestamp(a) 2010-10-31 02:25:26 1288481126 drop table t1; set global mysql56_temporal_format=false; -create table t1 (a timestamp); +create table t1 (a timestamp not null default now()); set timestamp=1288477526; insert t1 values (null); set timestamp=1288481126; diff --git a/mysql-test/main/old-mode.test b/mysql-test/main/old-mode.test index a09de1cf87d..0419be4bf6a 100644 --- a/mysql-test/main/old-mode.test +++ b/mysql-test/main/old-mode.test @@ -91,7 +91,7 @@ SET @@global.mysql56_temporal_format=DEFAULT; # Copy_field set time_zone='Europe/Moscow'; set global mysql56_temporal_format=false; -create table t1 (a timestamp); +create table t1 (a timestamp not null default now()); set timestamp=1288477526; insert t1 values (null); insert t1 values (); @@ -107,7 +107,7 @@ drop table t1; # field_conv_incompatible() set global mysql56_temporal_format=false; -create table t1 (a timestamp); +create table t1 (a timestamp not null default now()); set timestamp=1288477526; insert t1 values (null); set timestamp=1288481126; diff --git a/mysql-test/main/partition_alter.result b/mysql-test/main/partition_alter.result index d233486b427..648cdf37150 100644 --- a/mysql-test/main/partition_alter.result +++ b/mysql-test/main/partition_alter.result @@ -136,7 +136,7 @@ select * from t1 partition (p0); pk 1 drop table t1; -create or replace table t1 (pk int not null, x timestamp(6), unique u(pk, x)) engine innodb +create or replace table t1 (pk int not null, x timestamp(6) not null, unique u(pk, x)) engine innodb partition by key() partitions 2; insert into t1 (pk, x) values (1, '2000-01-01 00:00'), (2, '2000-01-01 00:01'); # Same for NOT NULL UNIQUE KEY as this is actually primary key @@ -147,7 +147,7 @@ select * from t1 partition (p0); pk 1 drop table t1; -create or replace table t1 (pk int, x timestamp(6), primary key (pk)) engine innodb +create or replace table t1 (pk int, x timestamp(6) not null, primary key (pk)) engine innodb partition by key(pk) partitions 2; insert into t1 (pk, x) values (1, '2000-01-01 00:00'), (2, '2000-01-01 00:01'); # Inplace for DROP PRIMARY KEY when partitioned by explicit field list is allowed diff --git a/mysql-test/main/partition_alter.test b/mysql-test/main/partition_alter.test index 782089087ae..2800e12589f 100644 --- a/mysql-test/main/partition_alter.test +++ b/mysql-test/main/partition_alter.test @@ -126,7 +126,7 @@ alter table t1 drop primary key, drop column x, add primary key (pk); select * from t1 partition (p0); drop table t1; -create or replace table t1 (pk int not null, x timestamp(6), unique u(pk, x)) engine innodb +create or replace table t1 (pk int not null, x timestamp(6) not null, unique u(pk, x)) engine innodb partition by key() partitions 2; insert into t1 (pk, x) values (1, '2000-01-01 00:00'), (2, '2000-01-01 00:01'); --echo # Same for NOT NULL UNIQUE KEY as this is actually primary key @@ -136,7 +136,7 @@ alter table t1 drop key u, drop column x, add unique (pk); select * from t1 partition (p0); drop table t1; -create or replace table t1 (pk int, x timestamp(6), primary key (pk)) engine innodb +create or replace table t1 (pk int, x timestamp(6) not null, primary key (pk)) engine innodb partition by key(pk) partitions 2; insert into t1 (pk, x) values (1, '2000-01-01 00:00'), (2, '2000-01-01 00:01'); --echo # Inplace for DROP PRIMARY KEY when partitioned by explicit field list is allowed diff --git a/mysql-test/main/sp-anchor-type.result b/mysql-test/main/sp-anchor-type.result index a878e73d8c8..a4c759c3020 100644 --- a/mysql-test/main/sp-anchor-type.result +++ b/mysql-test/main/sp-anchor-type.result @@ -562,7 +562,7 @@ def tm6 tm6 11 17 15 Y 128 6 63 def dt0 dt0 12 19 19 Y 128 0 63 def dt3 dt3 12 23 23 Y 128 3 63 def dt6 dt6 12 26 26 Y 128 6 63 -def ts0 ts0 7 19 19 Y 9376 0 63 +def ts0 ts0 7 19 19 Y 160 0 63 def ts3 ts3 7 23 23 Y 160 3 63 def ts6 ts6 7 26 26 Y 160 6 63 bit6 0 diff --git a/mysql-test/main/system_mysql_db_fix40123.result b/mysql-test/main/system_mysql_db_fix40123.result index 4ab80425a35..a7252091347 100644 --- a/mysql-test/main/system_mysql_db_fix40123.result +++ b/mysql-test/main/system_mysql_db_fix40123.result @@ -14,8 +14,8 @@ Warning 1280 Name 'Host' ignored for PRIMARY key. INSERT INTO user VALUES ('localhost','root','','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','','','','',0,0,0); INSERT INTO user VALUES ('localhost','','','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','','','','',0,0,0); CREATE TABLE func ( name char(64) binary DEFAULT '' NOT NULL, ret tinyint(1) DEFAULT '0' NOT NULL, dl char(128) DEFAULT '' NOT NULL, type enum ('function','aggregate') COLLATE utf8_general_ci NOT NULL, PRIMARY KEY (name) ) engine=MyISAM CHARACTER SET utf8 COLLATE utf8_bin comment='User defined functions'; -CREATE TABLE tables_priv ( Host char(60) binary DEFAULT '' NOT NULL, Db char(64) binary DEFAULT '' NOT NULL, User char(16) binary DEFAULT '' NOT NULL, Table_name char(64) binary DEFAULT '' NOT NULL, Grantor char(77) DEFAULT '' NOT NULL, Timestamp timestamp, Table_priv set('Select','Insert','Update','Delete','Create','Drop','Grant','References','Index','Alter') COLLATE utf8_general_ci DEFAULT '' NOT NULL, Column_priv set('Select','Insert','Update','References') COLLATE utf8_general_ci DEFAULT '' NOT NULL, PRIMARY KEY (Host,Db,User,Table_name), KEY Grantor (Grantor) ) engine=MyISAM CHARACTER SET utf8 COLLATE utf8_bin comment='Table privileges'; -CREATE TABLE columns_priv ( Host char(60) binary DEFAULT '' NOT NULL, Db char(64) binary DEFAULT '' NOT NULL, User char(16) binary DEFAULT '' NOT NULL, Table_name char(64) binary DEFAULT '' NOT NULL, Column_name char(64) binary DEFAULT '' NOT NULL, Timestamp timestamp, Column_priv set('Select','Insert','Update','References') COLLATE utf8_general_ci DEFAULT '' NOT NULL, PRIMARY KEY (Host,Db,User,Table_name,Column_name) ) engine=MyISAM CHARACTER SET utf8 COLLATE utf8_bin comment='Column privileges'; +CREATE TABLE tables_priv ( Host char(60) binary DEFAULT '' NOT NULL, Db char(64) binary DEFAULT '' NOT NULL, User char(16) binary DEFAULT '' NOT NULL, Table_name char(64) binary DEFAULT '' NOT NULL, Grantor char(77) DEFAULT '' NOT NULL, Timestamp timestamp not null default now() on update now(), Table_priv set('Select','Insert','Update','Delete','Create','Drop','Grant','References','Index','Alter') COLLATE utf8_general_ci DEFAULT '' NOT NULL, Column_priv set('Select','Insert','Update','References') COLLATE utf8_general_ci DEFAULT '' NOT NULL, PRIMARY KEY (Host,Db,User,Table_name), KEY Grantor (Grantor) ) engine=MyISAM CHARACTER SET utf8 COLLATE utf8_bin comment='Table privileges'; +CREATE TABLE columns_priv ( Host char(60) binary DEFAULT '' NOT NULL, Db char(64) binary DEFAULT '' NOT NULL, User char(16) binary DEFAULT '' NOT NULL, Table_name char(64) binary DEFAULT '' NOT NULL, Column_name char(64) binary DEFAULT '' NOT NULL, Timestamp timestamp not null default now() on update now(), Column_priv set('Select','Insert','Update','References') COLLATE utf8_general_ci DEFAULT '' NOT NULL, PRIMARY KEY (Host,Db,User,Table_name,Column_name) ) engine=MyISAM CHARACTER SET utf8 COLLATE utf8_bin comment='Column privileges'; CREATE TABLE help_topic ( help_topic_id int unsigned not null, name varchar(64) not null, help_category_id smallint unsigned not null, description text not null, example text not null, url varchar(128) not null, primary key (help_topic_id), unique index (name) ) engine=MyISAM CHARACTER SET utf8 comment='help topics'; CREATE TABLE help_category ( help_category_id smallint unsigned not null, name varchar(64) not null, parent_category_id smallint unsigned null, url varchar(128) not null, primary key (help_category_id), unique index (name) ) engine=MyISAM CHARACTER SET utf8 comment='help categories'; CREATE TABLE help_relation ( help_topic_id int unsigned not null references help_topic, help_keyword_id int unsigned not null references help_keyword, primary key (help_keyword_id, help_topic_id) ) engine=MyISAM CHARACTER SET utf8 comment='keyword-topic relation'; diff --git a/mysql-test/main/system_mysql_db_fix40123.test b/mysql-test/main/system_mysql_db_fix40123.test index 08aac433433..5e4672ea4e8 100644 --- a/mysql-test/main/system_mysql_db_fix40123.test +++ b/mysql-test/main/system_mysql_db_fix40123.test @@ -33,8 +33,8 @@ CREATE TABLE user ( Host char(60) binary DEFAULT '' NOT NULL, User char(16) bina INSERT INTO user VALUES ('localhost','root','','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','','','','',0,0,0); INSERT INTO user VALUES ('localhost','','','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','','','','',0,0,0); CREATE TABLE func ( name char(64) binary DEFAULT '' NOT NULL, ret tinyint(1) DEFAULT '0' NOT NULL, dl char(128) DEFAULT '' NOT NULL, type enum ('function','aggregate') COLLATE utf8_general_ci NOT NULL, PRIMARY KEY (name) ) engine=MyISAM CHARACTER SET utf8 COLLATE utf8_bin comment='User defined functions'; -CREATE TABLE tables_priv ( Host char(60) binary DEFAULT '' NOT NULL, Db char(64) binary DEFAULT '' NOT NULL, User char(16) binary DEFAULT '' NOT NULL, Table_name char(64) binary DEFAULT '' NOT NULL, Grantor char(77) DEFAULT '' NOT NULL, Timestamp timestamp, Table_priv set('Select','Insert','Update','Delete','Create','Drop','Grant','References','Index','Alter') COLLATE utf8_general_ci DEFAULT '' NOT NULL, Column_priv set('Select','Insert','Update','References') COLLATE utf8_general_ci DEFAULT '' NOT NULL, PRIMARY KEY (Host,Db,User,Table_name), KEY Grantor (Grantor) ) engine=MyISAM CHARACTER SET utf8 COLLATE utf8_bin comment='Table privileges'; -CREATE TABLE columns_priv ( Host char(60) binary DEFAULT '' NOT NULL, Db char(64) binary DEFAULT '' NOT NULL, User char(16) binary DEFAULT '' NOT NULL, Table_name char(64) binary DEFAULT '' NOT NULL, Column_name char(64) binary DEFAULT '' NOT NULL, Timestamp timestamp, Column_priv set('Select','Insert','Update','References') COLLATE utf8_general_ci DEFAULT '' NOT NULL, PRIMARY KEY (Host,Db,User,Table_name,Column_name) ) engine=MyISAM CHARACTER SET utf8 COLLATE utf8_bin comment='Column privileges'; +CREATE TABLE tables_priv ( Host char(60) binary DEFAULT '' NOT NULL, Db char(64) binary DEFAULT '' NOT NULL, User char(16) binary DEFAULT '' NOT NULL, Table_name char(64) binary DEFAULT '' NOT NULL, Grantor char(77) DEFAULT '' NOT NULL, Timestamp timestamp not null default now() on update now(), Table_priv set('Select','Insert','Update','Delete','Create','Drop','Grant','References','Index','Alter') COLLATE utf8_general_ci DEFAULT '' NOT NULL, Column_priv set('Select','Insert','Update','References') COLLATE utf8_general_ci DEFAULT '' NOT NULL, PRIMARY KEY (Host,Db,User,Table_name), KEY Grantor (Grantor) ) engine=MyISAM CHARACTER SET utf8 COLLATE utf8_bin comment='Table privileges'; +CREATE TABLE columns_priv ( Host char(60) binary DEFAULT '' NOT NULL, Db char(64) binary DEFAULT '' NOT NULL, User char(16) binary DEFAULT '' NOT NULL, Table_name char(64) binary DEFAULT '' NOT NULL, Column_name char(64) binary DEFAULT '' NOT NULL, Timestamp timestamp not null default now() on update now(), Column_priv set('Select','Insert','Update','References') COLLATE utf8_general_ci DEFAULT '' NOT NULL, PRIMARY KEY (Host,Db,User,Table_name,Column_name) ) engine=MyISAM CHARACTER SET utf8 COLLATE utf8_bin comment='Column privileges'; CREATE TABLE help_topic ( help_topic_id int unsigned not null, name varchar(64) not null, help_category_id smallint unsigned not null, description text not null, example text not null, url varchar(128) not null, primary key (help_topic_id), unique index (name) ) engine=MyISAM CHARACTER SET utf8 comment='help topics'; CREATE TABLE help_category ( help_category_id smallint unsigned not null, name varchar(64) not null, parent_category_id smallint unsigned null, url varchar(128) not null, primary key (help_category_id), unique index (name) ) engine=MyISAM CHARACTER SET utf8 comment='help categories'; CREATE TABLE help_relation ( help_topic_id int unsigned not null references help_topic, help_keyword_id int unsigned not null references help_keyword, primary key (help_keyword_id, help_topic_id) ) engine=MyISAM CHARACTER SET utf8 comment='keyword-topic relation'; diff --git a/mysql-test/main/system_mysql_db_fix50030.result b/mysql-test/main/system_mysql_db_fix50030.result index 4244ab47d50..d7234d00296 100644 --- a/mysql-test/main/system_mysql_db_fix50030.result +++ b/mysql-test/main/system_mysql_db_fix50030.result @@ -14,8 +14,8 @@ Warning 1280 Name 'Host' ignored for PRIMARY key. INSERT INTO user VALUES ('localhost','root','','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','','','','',0,0,0,0); INSERT INTO user VALUES ('localhost','','','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','','','','',0,0,0, 0); CREATE TABLE func ( name char(64) binary DEFAULT '' NOT NULL, ret tinyint(1) DEFAULT '0' NOT NULL, dl char(128) DEFAULT '' NOT NULL, type enum ('function','aggregate') COLLATE utf8_general_ci NOT NULL, PRIMARY KEY (name) ) engine=MyISAM CHARACTER SET utf8 COLLATE utf8_bin comment='User defined functions'; -CREATE TABLE tables_priv ( Host char(60) binary DEFAULT '' NOT NULL, Db char(64) binary DEFAULT '' NOT NULL, User char(16) binary DEFAULT '' NOT NULL, Table_name char(64) binary DEFAULT '' NOT NULL, Grantor char(77) DEFAULT '' NOT NULL, Timestamp timestamp, Table_priv set('Select','Insert','Update','Delete','Create','Drop','Grant','References','Index','Alter','Create View','Show view') COLLATE utf8_general_ci DEFAULT '' NOT NULL, Column_priv set('Select','Insert','Update','References') COLLATE utf8_general_ci DEFAULT '' NOT NULL, PRIMARY KEY (Host,Db,User,Table_name), KEY Grantor (Grantor) ) engine=MyISAM CHARACTER SET utf8 COLLATE utf8_bin comment='Table privileges'; -CREATE TABLE columns_priv ( Host char(60) binary DEFAULT '' NOT NULL, Db char(64) binary DEFAULT '' NOT NULL, User char(16) binary DEFAULT '' NOT NULL, Table_name char(64) binary DEFAULT '' NOT NULL, Column_name char(64) binary DEFAULT '' NOT NULL, Timestamp timestamp, Column_priv set('Select','Insert','Update','References') COLLATE utf8_general_ci DEFAULT '' NOT NULL, PRIMARY KEY (Host,Db,User,Table_name,Column_name) ) engine=MyISAM CHARACTER SET utf8 COLLATE utf8_bin comment='Column privileges'; +CREATE TABLE tables_priv ( Host char(60) binary DEFAULT '' NOT NULL, Db char(64) binary DEFAULT '' NOT NULL, User char(16) binary DEFAULT '' NOT NULL, Table_name char(64) binary DEFAULT '' NOT NULL, Grantor char(77) DEFAULT '' NOT NULL, Timestamp timestamp not null default now() on update now(), Table_priv set('Select','Insert','Update','Delete','Create','Drop','Grant','References','Index','Alter','Create View','Show view') COLLATE utf8_general_ci DEFAULT '' NOT NULL, Column_priv set('Select','Insert','Update','References') COLLATE utf8_general_ci DEFAULT '' NOT NULL, PRIMARY KEY (Host,Db,User,Table_name), KEY Grantor (Grantor) ) engine=MyISAM CHARACTER SET utf8 COLLATE utf8_bin comment='Table privileges'; +CREATE TABLE columns_priv ( Host char(60) binary DEFAULT '' NOT NULL, Db char(64) binary DEFAULT '' NOT NULL, User char(16) binary DEFAULT '' NOT NULL, Table_name char(64) binary DEFAULT '' NOT NULL, Column_name char(64) binary DEFAULT '' NOT NULL, Timestamp timestamp not null default now() on update now(), Column_priv set('Select','Insert','Update','References') COLLATE utf8_general_ci DEFAULT '' NOT NULL, PRIMARY KEY (Host,Db,User,Table_name,Column_name) ) engine=MyISAM CHARACTER SET utf8 COLLATE utf8_bin comment='Column privileges'; CREATE TABLE help_topic ( help_topic_id int unsigned not null, name char(64) not null, help_category_id smallint unsigned not null, description text not null, example text not null, url char(128) not null, primary key (help_topic_id), unique index (name) ) engine=MyISAM CHARACTER SET utf8 comment='help topics'; CREATE TABLE help_category ( help_category_id smallint unsigned not null, name char(64) not null, parent_category_id smallint unsigned null, url char(128) not null, primary key (help_category_id), unique index (name) ) engine=MyISAM CHARACTER SET utf8 comment='help categories'; CREATE TABLE help_relation ( help_topic_id int unsigned not null references help_topic, help_keyword_id int unsigned not null references help_keyword, primary key (help_keyword_id, help_topic_id) ) engine=MyISAM CHARACTER SET utf8 comment='keyword-topic relation'; @@ -35,7 +35,7 @@ Warning 1280 Name 'TzIdTrTId' ignored for PRIMARY key. CREATE TABLE time_zone_leap_second ( Transition_time bigint signed NOT NULL, Correction int signed NOT NULL, PRIMARY KEY TranTime (Transition_time) ) engine=MyISAM CHARACTER SET utf8 comment='Leap seconds information for time zones'; Warnings: Warning 1280 Name 'TranTime' ignored for PRIMARY key. -CREATE TABLE proc ( db char(64) collate utf8_bin DEFAULT '' NOT NULL, name char(64) DEFAULT '' NOT NULL, type enum('FUNCTION','PROCEDURE') NOT NULL, specific_name char(64) DEFAULT '' NOT NULL, language enum('SQL') DEFAULT 'SQL' NOT NULL, sql_data_access enum('CONTAINS_SQL', 'NO_SQL', 'READS_SQL_DATA', 'MODIFIES_SQL_DATA' ) DEFAULT 'CONTAINS_SQL' NOT NULL, is_deterministic enum('YES','NO') DEFAULT 'NO' NOT NULL, security_type enum('INVOKER','DEFINER') DEFAULT 'DEFINER' NOT NULL, param_list blob DEFAULT '' NOT NULL, returns char(64) DEFAULT '' NOT NULL, body longblob DEFAULT '' NOT NULL, definer char(77) collate utf8_bin DEFAULT '' NOT NULL, created timestamp, modified timestamp, sql_mode set( 'REAL_AS_FLOAT', 'PIPES_AS_CONCAT', 'ANSI_QUOTES', 'IGNORE_SPACE', 'NOT_USED', 'ONLY_FULL_GROUP_BY', 'NO_UNSIGNED_SUBTRACTION', 'NO_DIR_IN_CREATE', 'POSTGRESQL', 'ORACLE', 'MSSQL', 'DB2', 'MAXDB', 'NO_KEY_OPTIONS', 'NO_TABLE_OPTIONS', 'NO_FIELD_OPTIONS', 'MYSQL323', 'MYSQL40', 'ANSI', 'NO_AUTO_VALUE_ON_ZERO', 'NO_BACKSLASH_ESCAPES', 'STRICT_TRANS_TABLES', 'STRICT_ALL_TABLES', 'NO_ZERO_IN_DATE', 'NO_ZERO_DATE', 'INVALID_DATES', 'ERROR_FOR_DIVISION_BY_ZERO', 'TRADITIONAL', 'NO_AUTO_CREATE_USER', 'HIGH_NOT_PRECEDENCE' ) DEFAULT '' NOT NULL, comment char(64) collate utf8_bin DEFAULT '' NOT NULL, PRIMARY KEY (db,name,type) ) engine=MyISAM character set utf8 comment='Stored Procedures'; +CREATE TABLE proc (db char(64) collate utf8_bin DEFAULT '' NOT NULL, name char(64) DEFAULT '' NOT NULL, type enum('FUNCTION','PROCEDURE') NOT NULL, specific_name char(64) DEFAULT '' NOT NULL, language enum('SQL') DEFAULT 'SQL' NOT NULL, sql_data_access enum('CONTAINS_SQL','NO_SQL','READS_SQL_DATA','MODIFIES_SQL_DATA' ) DEFAULT 'CONTAINS_SQL' NOT NULL, is_deterministic enum('YES','NO') DEFAULT 'NO' NOT NULL, security_type enum('INVOKER','DEFINER') DEFAULT 'DEFINER' NOT NULL, param_list blob DEFAULT '' NOT NULL, returns char(64) DEFAULT '' NOT NULL, body longblob DEFAULT '' NOT NULL, definer char(77) collate utf8_bin DEFAULT '' NOT NULL, created timestamp not null default now() on update now(), modified timestamp not null default 0, sql_mode set( 'REAL_AS_FLOAT', 'PIPES_AS_CONCAT', 'ANSI_QUOTES', 'IGNORE_SPACE', 'NOT_USED', 'ONLY_FULL_GROUP_BY', 'NO_UNSIGNED_SUBTRACTION', 'NO_DIR_IN_CREATE', 'POSTGRESQL', 'ORACLE', 'MSSQL', 'DB2', 'MAXDB', 'NO_KEY_OPTIONS', 'NO_TABLE_OPTIONS', 'NO_FIELD_OPTIONS', 'MYSQL323', 'MYSQL40', 'ANSI', 'NO_AUTO_VALUE_ON_ZERO', 'NO_BACKSLASH_ESCAPES', 'STRICT_TRANS_TABLES', 'STRICT_ALL_TABLES', 'NO_ZERO_IN_DATE', 'NO_ZERO_DATE', 'INVALID_DATES', 'ERROR_FOR_DIVISION_BY_ZERO', 'TRADITIONAL', 'NO_AUTO_CREATE_USER', 'HIGH_NOT_PRECEDENCE' ) DEFAULT '' NOT NULL, comment char(64) collate utf8_bin DEFAULT '' NOT NULL, PRIMARY KEY (db,name,type) ) engine=MyISAM character set utf8 comment='Stored Procedures'; CREATE TABLE procs_priv ( Host char(60) binary DEFAULT '' NOT NULL, Db char(64) binary DEFAULT '' NOT NULL, User char(16) binary DEFAULT '' NOT NULL, Routine_name char(64) binary DEFAULT '' NOT NULL, Routine_type enum('FUNCTION','PROCEDURE') NOT NULL, Grantor char(77) DEFAULT '' NOT NULL, Proc_priv set('Execute','Alter Routine','Grant') COLLATE utf8_general_ci DEFAULT '' NOT NULL, Timestamp timestamp, PRIMARY KEY (Host,Db,User,Routine_name,Routine_type), KEY Grantor (Grantor) ) engine=MyISAM CHARACTER SET utf8 COLLATE utf8_bin comment='Procedure privileges'; CREATE TABLE servers ( Server_name char(64) NOT NULL DEFAULT '', Host char(64) NOT NULL DEFAULT '', Db char(64) NOT NULL DEFAULT '', Username char(64) NOT NULL DEFAULT '', Password char(64) NOT NULL DEFAULT '', Port INT(4) NOT NULL DEFAULT '0', Socket char(64) NOT NULL DEFAULT '', Wrapper char(64) NOT NULL DEFAULT '', Owner char(64) NOT NULL DEFAULT '', PRIMARY KEY (Server_name)) CHARACTER SET utf8 comment='MySQL Foreign Servers table'; INSERT INTO servers VALUES ('test','localhost','test','root','', 0,'','mysql','root'); diff --git a/mysql-test/main/system_mysql_db_fix50030.test b/mysql-test/main/system_mysql_db_fix50030.test index a9830471988..8fc049f8797 100644 --- a/mysql-test/main/system_mysql_db_fix50030.test +++ b/mysql-test/main/system_mysql_db_fix50030.test @@ -33,8 +33,8 @@ CREATE TABLE user ( Host char(60) binary DEFAULT '' NOT NULL, User char(16) bina INSERT INTO user VALUES ('localhost','root','','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','','','','',0,0,0,0); INSERT INTO user VALUES ('localhost','','','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','','','','',0,0,0, 0); CREATE TABLE func ( name char(64) binary DEFAULT '' NOT NULL, ret tinyint(1) DEFAULT '0' NOT NULL, dl char(128) DEFAULT '' NOT NULL, type enum ('function','aggregate') COLLATE utf8_general_ci NOT NULL, PRIMARY KEY (name) ) engine=MyISAM CHARACTER SET utf8 COLLATE utf8_bin comment='User defined functions'; -CREATE TABLE tables_priv ( Host char(60) binary DEFAULT '' NOT NULL, Db char(64) binary DEFAULT '' NOT NULL, User char(16) binary DEFAULT '' NOT NULL, Table_name char(64) binary DEFAULT '' NOT NULL, Grantor char(77) DEFAULT '' NOT NULL, Timestamp timestamp, Table_priv set('Select','Insert','Update','Delete','Create','Drop','Grant','References','Index','Alter','Create View','Show view') COLLATE utf8_general_ci DEFAULT '' NOT NULL, Column_priv set('Select','Insert','Update','References') COLLATE utf8_general_ci DEFAULT '' NOT NULL, PRIMARY KEY (Host,Db,User,Table_name), KEY Grantor (Grantor) ) engine=MyISAM CHARACTER SET utf8 COLLATE utf8_bin comment='Table privileges'; -CREATE TABLE columns_priv ( Host char(60) binary DEFAULT '' NOT NULL, Db char(64) binary DEFAULT '' NOT NULL, User char(16) binary DEFAULT '' NOT NULL, Table_name char(64) binary DEFAULT '' NOT NULL, Column_name char(64) binary DEFAULT '' NOT NULL, Timestamp timestamp, Column_priv set('Select','Insert','Update','References') COLLATE utf8_general_ci DEFAULT '' NOT NULL, PRIMARY KEY (Host,Db,User,Table_name,Column_name) ) engine=MyISAM CHARACTER SET utf8 COLLATE utf8_bin comment='Column privileges'; +CREATE TABLE tables_priv ( Host char(60) binary DEFAULT '' NOT NULL, Db char(64) binary DEFAULT '' NOT NULL, User char(16) binary DEFAULT '' NOT NULL, Table_name char(64) binary DEFAULT '' NOT NULL, Grantor char(77) DEFAULT '' NOT NULL, Timestamp timestamp not null default now() on update now(), Table_priv set('Select','Insert','Update','Delete','Create','Drop','Grant','References','Index','Alter','Create View','Show view') COLLATE utf8_general_ci DEFAULT '' NOT NULL, Column_priv set('Select','Insert','Update','References') COLLATE utf8_general_ci DEFAULT '' NOT NULL, PRIMARY KEY (Host,Db,User,Table_name), KEY Grantor (Grantor) ) engine=MyISAM CHARACTER SET utf8 COLLATE utf8_bin comment='Table privileges'; +CREATE TABLE columns_priv ( Host char(60) binary DEFAULT '' NOT NULL, Db char(64) binary DEFAULT '' NOT NULL, User char(16) binary DEFAULT '' NOT NULL, Table_name char(64) binary DEFAULT '' NOT NULL, Column_name char(64) binary DEFAULT '' NOT NULL, Timestamp timestamp not null default now() on update now(), Column_priv set('Select','Insert','Update','References') COLLATE utf8_general_ci DEFAULT '' NOT NULL, PRIMARY KEY (Host,Db,User,Table_name,Column_name) ) engine=MyISAM CHARACTER SET utf8 COLLATE utf8_bin comment='Column privileges'; CREATE TABLE help_topic ( help_topic_id int unsigned not null, name char(64) not null, help_category_id smallint unsigned not null, description text not null, example text not null, url char(128) not null, primary key (help_topic_id), unique index (name) ) engine=MyISAM CHARACTER SET utf8 comment='help topics'; CREATE TABLE help_category ( help_category_id smallint unsigned not null, name char(64) not null, parent_category_id smallint unsigned null, url char(128) not null, primary key (help_category_id), unique index (name) ) engine=MyISAM CHARACTER SET utf8 comment='help categories'; CREATE TABLE help_relation ( help_topic_id int unsigned not null references help_topic, help_keyword_id int unsigned not null references help_keyword, primary key (help_keyword_id, help_topic_id) ) engine=MyISAM CHARACTER SET utf8 comment='keyword-topic relation'; @@ -44,7 +44,7 @@ CREATE TABLE time_zone ( Time_zone_id int unsigned NOT NULL auto_increment, Use_ CREATE TABLE time_zone_transition ( Time_zone_id int unsigned NOT NULL, Transition_time bigint signed NOT NULL, Transition_type_id int unsigned NOT NULL, PRIMARY KEY TzIdTranTime (Time_zone_id, Transition_time) ) engine=MyISAM CHARACTER SET utf8 comment='Time zone transitions'; CREATE TABLE time_zone_transition_type ( Time_zone_id int unsigned NOT NULL, Transition_type_id int unsigned NOT NULL, `Offset` int signed DEFAULT 0 NOT NULL, Is_DST tinyint unsigned DEFAULT 0 NOT NULL, Abbreviation char(8) DEFAULT '' NOT NULL, PRIMARY KEY TzIdTrTId (Time_zone_id, Transition_type_id) ) engine=MyISAM CHARACTER SET utf8 comment='Time zone transition types'; CREATE TABLE time_zone_leap_second ( Transition_time bigint signed NOT NULL, Correction int signed NOT NULL, PRIMARY KEY TranTime (Transition_time) ) engine=MyISAM CHARACTER SET utf8 comment='Leap seconds information for time zones'; -CREATE TABLE proc ( db char(64) collate utf8_bin DEFAULT '' NOT NULL, name char(64) DEFAULT '' NOT NULL, type enum('FUNCTION','PROCEDURE') NOT NULL, specific_name char(64) DEFAULT '' NOT NULL, language enum('SQL') DEFAULT 'SQL' NOT NULL, sql_data_access enum('CONTAINS_SQL', 'NO_SQL', 'READS_SQL_DATA', 'MODIFIES_SQL_DATA' ) DEFAULT 'CONTAINS_SQL' NOT NULL, is_deterministic enum('YES','NO') DEFAULT 'NO' NOT NULL, security_type enum('INVOKER','DEFINER') DEFAULT 'DEFINER' NOT NULL, param_list blob DEFAULT '' NOT NULL, returns char(64) DEFAULT '' NOT NULL, body longblob DEFAULT '' NOT NULL, definer char(77) collate utf8_bin DEFAULT '' NOT NULL, created timestamp, modified timestamp, sql_mode set( 'REAL_AS_FLOAT', 'PIPES_AS_CONCAT', 'ANSI_QUOTES', 'IGNORE_SPACE', 'NOT_USED', 'ONLY_FULL_GROUP_BY', 'NO_UNSIGNED_SUBTRACTION', 'NO_DIR_IN_CREATE', 'POSTGRESQL', 'ORACLE', 'MSSQL', 'DB2', 'MAXDB', 'NO_KEY_OPTIONS', 'NO_TABLE_OPTIONS', 'NO_FIELD_OPTIONS', 'MYSQL323', 'MYSQL40', 'ANSI', 'NO_AUTO_VALUE_ON_ZERO', 'NO_BACKSLASH_ESCAPES', 'STRICT_TRANS_TABLES', 'STRICT_ALL_TABLES', 'NO_ZERO_IN_DATE', 'NO_ZERO_DATE', 'INVALID_DATES', 'ERROR_FOR_DIVISION_BY_ZERO', 'TRADITIONAL', 'NO_AUTO_CREATE_USER', 'HIGH_NOT_PRECEDENCE' ) DEFAULT '' NOT NULL, comment char(64) collate utf8_bin DEFAULT '' NOT NULL, PRIMARY KEY (db,name,type) ) engine=MyISAM character set utf8 comment='Stored Procedures'; +CREATE TABLE proc (db char(64) collate utf8_bin DEFAULT '' NOT NULL, name char(64) DEFAULT '' NOT NULL, type enum('FUNCTION','PROCEDURE') NOT NULL, specific_name char(64) DEFAULT '' NOT NULL, language enum('SQL') DEFAULT 'SQL' NOT NULL, sql_data_access enum('CONTAINS_SQL','NO_SQL','READS_SQL_DATA','MODIFIES_SQL_DATA' ) DEFAULT 'CONTAINS_SQL' NOT NULL, is_deterministic enum('YES','NO') DEFAULT 'NO' NOT NULL, security_type enum('INVOKER','DEFINER') DEFAULT 'DEFINER' NOT NULL, param_list blob DEFAULT '' NOT NULL, returns char(64) DEFAULT '' NOT NULL, body longblob DEFAULT '' NOT NULL, definer char(77) collate utf8_bin DEFAULT '' NOT NULL, created timestamp not null default now() on update now(), modified timestamp not null default 0, sql_mode set( 'REAL_AS_FLOAT', 'PIPES_AS_CONCAT', 'ANSI_QUOTES', 'IGNORE_SPACE', 'NOT_USED', 'ONLY_FULL_GROUP_BY', 'NO_UNSIGNED_SUBTRACTION', 'NO_DIR_IN_CREATE', 'POSTGRESQL', 'ORACLE', 'MSSQL', 'DB2', 'MAXDB', 'NO_KEY_OPTIONS', 'NO_TABLE_OPTIONS', 'NO_FIELD_OPTIONS', 'MYSQL323', 'MYSQL40', 'ANSI', 'NO_AUTO_VALUE_ON_ZERO', 'NO_BACKSLASH_ESCAPES', 'STRICT_TRANS_TABLES', 'STRICT_ALL_TABLES', 'NO_ZERO_IN_DATE', 'NO_ZERO_DATE', 'INVALID_DATES', 'ERROR_FOR_DIVISION_BY_ZERO', 'TRADITIONAL', 'NO_AUTO_CREATE_USER', 'HIGH_NOT_PRECEDENCE' ) DEFAULT '' NOT NULL, comment char(64) collate utf8_bin DEFAULT '' NOT NULL, PRIMARY KEY (db,name,type) ) engine=MyISAM character set utf8 comment='Stored Procedures'; CREATE TABLE procs_priv ( Host char(60) binary DEFAULT '' NOT NULL, Db char(64) binary DEFAULT '' NOT NULL, User char(16) binary DEFAULT '' NOT NULL, Routine_name char(64) binary DEFAULT '' NOT NULL, Routine_type enum('FUNCTION','PROCEDURE') NOT NULL, Grantor char(77) DEFAULT '' NOT NULL, Proc_priv set('Execute','Alter Routine','Grant') COLLATE utf8_general_ci DEFAULT '' NOT NULL, Timestamp timestamp, PRIMARY KEY (Host,Db,User,Routine_name,Routine_type), KEY Grantor (Grantor) ) engine=MyISAM CHARACTER SET utf8 COLLATE utf8_bin comment='Procedure privileges'; CREATE TABLE servers ( Server_name char(64) NOT NULL DEFAULT '', Host char(64) NOT NULL DEFAULT '', Db char(64) NOT NULL DEFAULT '', Username char(64) NOT NULL DEFAULT '', Password char(64) NOT NULL DEFAULT '', Port INT(4) NOT NULL DEFAULT '0', Socket char(64) NOT NULL DEFAULT '', Wrapper char(64) NOT NULL DEFAULT '', Owner char(64) NOT NULL DEFAULT '', PRIMARY KEY (Server_name)) CHARACTER SET utf8 comment='MySQL Foreign Servers table'; INSERT INTO servers VALUES ('test','localhost','test','root','', 0,'','mysql','root'); diff --git a/mysql-test/main/timezone2.result b/mysql-test/main/timezone2.result index f943e285951..1b9a0f3cf86 100644 --- a/mysql-test/main/timezone2.result +++ b/mysql-test/main/timezone2.result @@ -607,7 +607,7 @@ SET time_zone=DEFAULT; # MDEV-19961 MIN(timestamp_column) returns a wrong result in a GROUP BY query # SET time_zone='Europe/Moscow'; -CREATE OR REPLACE TABLE t1 (i INT, d TIMESTAMP); +CREATE OR REPLACE TABLE t1 (i INT, d TIMESTAMP NOT NULL DEFAULT NOW()); SET timestamp=1288477526 /* this is summer time */ ; INSERT INTO t1 VALUES (3,NULL); SET timestamp=1288477526+3599 /* this is winter time*/ ; @@ -629,7 +629,7 @@ SET time_zone=DEFAULT; # MDEV-20397 Support TIMESTAMP, DATETIME, TIME in ROUND() and TRUNCATE() # SET time_zone='Europe/Moscow'; -CREATE TABLE t1 (i INT, d TIMESTAMP(6)); +CREATE TABLE t1 (i INT, d TIMESTAMP(6) NOT NULL DEFAULT NOW()); SET timestamp=1288479599.999999 /* this is the last second in summer time */ ; INSERT INTO t1 VALUES (1,NULL); SET timestamp=1288479600.000000 /* this is the first second in winter time */ ; diff --git a/mysql-test/main/timezone2.test b/mysql-test/main/timezone2.test index 6a8c9f258e4..d366cb6d4d3 100644 --- a/mysql-test/main/timezone2.test +++ b/mysql-test/main/timezone2.test @@ -556,7 +556,7 @@ SET time_zone=DEFAULT; --echo # SET time_zone='Europe/Moscow'; -CREATE OR REPLACE TABLE t1 (i INT, d TIMESTAMP); +CREATE OR REPLACE TABLE t1 (i INT, d TIMESTAMP NOT NULL DEFAULT NOW()); SET timestamp=1288477526 /* this is summer time */ ; INSERT INTO t1 VALUES (3,NULL); SET timestamp=1288477526+3599 /* this is winter time*/ ; @@ -573,7 +573,7 @@ SET time_zone=DEFAULT; --echo # SET time_zone='Europe/Moscow'; -CREATE TABLE t1 (i INT, d TIMESTAMP(6)); +CREATE TABLE t1 (i INT, d TIMESTAMP(6) NOT NULL DEFAULT NOW()); SET timestamp=1288479599.999999 /* this is the last second in summer time */ ; INSERT INTO t1 VALUES (1,NULL); SET timestamp=1288479600.000000 /* this is the first second in winter time */ ; diff --git a/mysql-test/main/trigger_null-8605.result b/mysql-test/main/trigger_null-8605.result index 10315988708..9dcd2994b79 100644 --- a/mysql-test/main/trigger_null-8605.result +++ b/mysql-test/main/trigger_null-8605.result @@ -183,7 +183,7 @@ a b c 1 NULL 1 2 2 NULL drop table t1; -create table t1 (a timestamp, b int auto_increment primary key); +create table t1 (a timestamp not null default now() on update now(), b int auto_increment primary key); create trigger trgi before insert on t1 for each row set new.a=if(new.a is null, '2000-10-20 10:20:30', NULL); set statement timestamp=777777777 for insert t1 (a) values (NULL); set statement timestamp=888888888 for insert t1 (a) values ('1999-12-11 10:9:8'); diff --git a/mysql-test/main/trigger_null-8605.test b/mysql-test/main/trigger_null-8605.test index 7645b61f5ad..c9a7cd5477d 100644 --- a/mysql-test/main/trigger_null-8605.test +++ b/mysql-test/main/trigger_null-8605.test @@ -152,7 +152,7 @@ drop table t1; --remove_file $datadir/test/mdev8605.txt # timestamps (on NULL = NOW()) -create table t1 (a timestamp, b int auto_increment primary key); +create table t1 (a timestamp not null default now() on update now(), b int auto_increment primary key); create trigger trgi before insert on t1 for each row set new.a=if(new.a is null, '2000-10-20 10:20:30', NULL); set statement timestamp=777777777 for insert t1 (a) values (NULL); set statement timestamp=888888888 for insert t1 (a) values ('1999-12-11 10:9:8'); diff --git a/mysql-test/main/type_temporal_mysql56_debug.result b/mysql-test/main/type_temporal_mysql56_debug.result index a93ec82fa4d..7794eecd117 100644 --- a/mysql-test/main/type_temporal_mysql56_debug.result +++ b/mysql-test/main/type_temporal_mysql56_debug.result @@ -301,25 +301,25 @@ CALL mdev16542; # Original table Table Create Table t1 CREATE TABLE `t1` ( - `a0` timestamp /* mysql-5.6 */ NOT NULL DEFAULT current_timestamp() ON UPDATE current_timestamp(), - `a1` timestamp(1) /* mysql-5.6 */ NOT NULL DEFAULT '0000-00-00 00:00:00.0', - `a2` timestamp(2) /* mysql-5.6 */ NOT NULL DEFAULT '0000-00-00 00:00:00.00', - `a3` timestamp(3) /* mysql-5.6 */ NOT NULL DEFAULT '0000-00-00 00:00:00.000', - `a4` timestamp(4) /* mysql-5.6 */ NOT NULL DEFAULT '0000-00-00 00:00:00.0000', - `a5` timestamp(5) /* mysql-5.6 */ NOT NULL DEFAULT '0000-00-00 00:00:00.00000', - `a6` timestamp(6) /* mysql-5.6 */ NOT NULL DEFAULT '0000-00-00 00:00:00.000000' + `a0` timestamp /* mysql-5.6 */ NULL DEFAULT NULL, + `a1` timestamp(1) /* mysql-5.6 */ NULL DEFAULT NULL, + `a2` timestamp(2) /* mysql-5.6 */ NULL DEFAULT NULL, + `a3` timestamp(3) /* mysql-5.6 */ NULL DEFAULT NULL, + `a4` timestamp(4) /* mysql-5.6 */ NULL DEFAULT NULL, + `a5` timestamp(5) /* mysql-5.6 */ NULL DEFAULT NULL, + `a6` timestamp(6) /* mysql-5.6 */ NULL DEFAULT NULL ) ENGINE=MyISAM DEFAULT CHARSET=latin1 # CREATE..SELECT and SHOW Table Create Table t2 CREATE TABLE `t2` ( - `a0` timestamp /* mysql-5.6 */ NOT NULL DEFAULT current_timestamp() ON UPDATE current_timestamp(), - `a1` timestamp(1) /* mysql-5.6 */ NOT NULL DEFAULT '0000-00-00 00:00:00.0', - `a2` timestamp(2) /* mysql-5.6 */ NOT NULL DEFAULT '0000-00-00 00:00:00.00', - `a3` timestamp(3) /* mysql-5.6 */ NOT NULL DEFAULT '0000-00-00 00:00:00.000', - `a4` timestamp(4) /* mysql-5.6 */ NOT NULL DEFAULT '0000-00-00 00:00:00.0000', - `a5` timestamp(5) /* mysql-5.6 */ NOT NULL DEFAULT '0000-00-00 00:00:00.00000', - `a6` timestamp(6) /* mysql-5.6 */ NOT NULL DEFAULT '0000-00-00 00:00:00.000000', + `a0` timestamp /* mysql-5.6 */ NULL DEFAULT NULL, + `a1` timestamp(1) /* mysql-5.6 */ NULL DEFAULT NULL, + `a2` timestamp(2) /* mysql-5.6 */ NULL DEFAULT NULL, + `a3` timestamp(3) /* mysql-5.6 */ NULL DEFAULT NULL, + `a4` timestamp(4) /* mysql-5.6 */ NULL DEFAULT NULL, + `a5` timestamp(5) /* mysql-5.6 */ NULL DEFAULT NULL, + `a6` timestamp(6) /* mysql-5.6 */ NULL DEFAULT NULL, `COALESCE(a0)` timestamp /* mysql-5.6 */ NULL DEFAULT NULL, `COALESCE(a1)` timestamp(1) /* mysql-5.6 */ NULL DEFAULT NULL, `COALESCE(a2)` timestamp(2) /* mysql-5.6 */ NULL DEFAULT NULL, @@ -332,13 +332,13 @@ t2 CREATE TABLE `t2` ( # ALTER..FORCE and SHOW Table Create Table t1 CREATE TABLE `t1` ( - `a0` timestamp /* mysql-5.6 */ NOT NULL DEFAULT current_timestamp() ON UPDATE current_timestamp(), - `a1` timestamp(1) /* mysql-5.6 */ NOT NULL DEFAULT '0000-00-00 00:00:00.0', - `a2` timestamp(2) /* mysql-5.6 */ NOT NULL DEFAULT '0000-00-00 00:00:00.00', - `a3` timestamp(3) /* mysql-5.6 */ NOT NULL DEFAULT '0000-00-00 00:00:00.000', - `a4` timestamp(4) /* mysql-5.6 */ NOT NULL DEFAULT '0000-00-00 00:00:00.0000', - `a5` timestamp(5) /* mysql-5.6 */ NOT NULL DEFAULT '0000-00-00 00:00:00.00000', - `a6` timestamp(6) /* mysql-5.6 */ NOT NULL DEFAULT '0000-00-00 00:00:00.000000' + `a0` timestamp /* mysql-5.6 */ NULL DEFAULT NULL, + `a1` timestamp(1) /* mysql-5.6 */ NULL DEFAULT NULL, + `a2` timestamp(2) /* mysql-5.6 */ NULL DEFAULT NULL, + `a3` timestamp(3) /* mysql-5.6 */ NULL DEFAULT NULL, + `a4` timestamp(4) /* mysql-5.6 */ NULL DEFAULT NULL, + `a5` timestamp(5) /* mysql-5.6 */ NULL DEFAULT NULL, + `a6` timestamp(6) /* mysql-5.6 */ NULL DEFAULT NULL ) ENGINE=MyISAM DEFAULT CHARSET=latin1 # Setting @@global.mysql56_temporal_format=false @@ -346,13 +346,13 @@ t1 CREATE TABLE `t1` ( # CREATE..SELECT and SHOW Table Create Table t2 CREATE TABLE `t2` ( - `a0` timestamp /* mariadb-5.3 */ NOT NULL DEFAULT current_timestamp() ON UPDATE current_timestamp(), - `a1` timestamp(1) /* mariadb-5.3 */ NOT NULL DEFAULT '0000-00-00 00:00:00.0', - `a2` timestamp(2) /* mariadb-5.3 */ NOT NULL DEFAULT '0000-00-00 00:00:00.00', - `a3` timestamp(3) /* mariadb-5.3 */ NOT NULL DEFAULT '0000-00-00 00:00:00.000', - `a4` timestamp(4) /* mariadb-5.3 */ NOT NULL DEFAULT '0000-00-00 00:00:00.0000', - `a5` timestamp(5) /* mariadb-5.3 */ NOT NULL DEFAULT '0000-00-00 00:00:00.00000', - `a6` timestamp(6) /* mariadb-5.3 */ NOT NULL DEFAULT '0000-00-00 00:00:00.000000', + `a0` timestamp /* mariadb-5.3 */ NULL DEFAULT NULL, + `a1` timestamp(1) /* mariadb-5.3 */ NULL DEFAULT NULL, + `a2` timestamp(2) /* mariadb-5.3 */ NULL DEFAULT NULL, + `a3` timestamp(3) /* mariadb-5.3 */ NULL DEFAULT NULL, + `a4` timestamp(4) /* mariadb-5.3 */ NULL DEFAULT NULL, + `a5` timestamp(5) /* mariadb-5.3 */ NULL DEFAULT NULL, + `a6` timestamp(6) /* mariadb-5.3 */ NULL DEFAULT NULL, `COALESCE(a0)` timestamp /* mariadb-5.3 */ NULL DEFAULT NULL, `COALESCE(a1)` timestamp(1) /* mariadb-5.3 */ NULL DEFAULT NULL, `COALESCE(a2)` timestamp(2) /* mariadb-5.3 */ NULL DEFAULT NULL, @@ -365,13 +365,13 @@ t2 CREATE TABLE `t2` ( # ALTER..FORCE and SHOW Table Create Table t1 CREATE TABLE `t1` ( - `a0` timestamp /* mariadb-5.3 */ NOT NULL DEFAULT current_timestamp() ON UPDATE current_timestamp(), - `a1` timestamp(1) /* mariadb-5.3 */ NOT NULL DEFAULT '0000-00-00 00:00:00.0', - `a2` timestamp(2) /* mariadb-5.3 */ NOT NULL DEFAULT '0000-00-00 00:00:00.00', - `a3` timestamp(3) /* mariadb-5.3 */ NOT NULL DEFAULT '0000-00-00 00:00:00.000', - `a4` timestamp(4) /* mariadb-5.3 */ NOT NULL DEFAULT '0000-00-00 00:00:00.0000', - `a5` timestamp(5) /* mariadb-5.3 */ NOT NULL DEFAULT '0000-00-00 00:00:00.00000', - `a6` timestamp(6) /* mariadb-5.3 */ NOT NULL DEFAULT '0000-00-00 00:00:00.000000' + `a0` timestamp /* mariadb-5.3 */ NULL DEFAULT NULL, + `a1` timestamp(1) /* mariadb-5.3 */ NULL DEFAULT NULL, + `a2` timestamp(2) /* mariadb-5.3 */ NULL DEFAULT NULL, + `a3` timestamp(3) /* mariadb-5.3 */ NULL DEFAULT NULL, + `a4` timestamp(4) /* mariadb-5.3 */ NULL DEFAULT NULL, + `a5` timestamp(5) /* mariadb-5.3 */ NULL DEFAULT NULL, + `a6` timestamp(6) /* mariadb-5.3 */ NULL DEFAULT NULL ) ENGINE=MyISAM DEFAULT CHARSET=latin1 # Setting @@global.mysql56_temporal_format=true @@ -379,13 +379,13 @@ t1 CREATE TABLE `t1` ( # CREATE..SELECT and SHOW Table Create Table t2 CREATE TABLE `t2` ( - `a0` timestamp /* mysql-5.6 */ NOT NULL DEFAULT current_timestamp() ON UPDATE current_timestamp(), - `a1` timestamp(1) /* mysql-5.6 */ NOT NULL DEFAULT '0000-00-00 00:00:00.0', - `a2` timestamp(2) /* mysql-5.6 */ NOT NULL DEFAULT '0000-00-00 00:00:00.00', - `a3` timestamp(3) /* mysql-5.6 */ NOT NULL DEFAULT '0000-00-00 00:00:00.000', - `a4` timestamp(4) /* mysql-5.6 */ NOT NULL DEFAULT '0000-00-00 00:00:00.0000', - `a5` timestamp(5) /* mysql-5.6 */ NOT NULL DEFAULT '0000-00-00 00:00:00.00000', - `a6` timestamp(6) /* mysql-5.6 */ NOT NULL DEFAULT '0000-00-00 00:00:00.000000', + `a0` timestamp /* mysql-5.6 */ NULL DEFAULT NULL, + `a1` timestamp(1) /* mysql-5.6 */ NULL DEFAULT NULL, + `a2` timestamp(2) /* mysql-5.6 */ NULL DEFAULT NULL, + `a3` timestamp(3) /* mysql-5.6 */ NULL DEFAULT NULL, + `a4` timestamp(4) /* mysql-5.6 */ NULL DEFAULT NULL, + `a5` timestamp(5) /* mysql-5.6 */ NULL DEFAULT NULL, + `a6` timestamp(6) /* mysql-5.6 */ NULL DEFAULT NULL, `COALESCE(a0)` timestamp /* mysql-5.6 */ NULL DEFAULT NULL, `COALESCE(a1)` timestamp(1) /* mysql-5.6 */ NULL DEFAULT NULL, `COALESCE(a2)` timestamp(2) /* mysql-5.6 */ NULL DEFAULT NULL, @@ -398,13 +398,13 @@ t2 CREATE TABLE `t2` ( # ALTER..FORCE and SHOW Table Create Table t1 CREATE TABLE `t1` ( - `a0` timestamp /* mysql-5.6 */ NOT NULL DEFAULT current_timestamp() ON UPDATE current_timestamp(), - `a1` timestamp(1) /* mysql-5.6 */ NOT NULL DEFAULT '0000-00-00 00:00:00.0', - `a2` timestamp(2) /* mysql-5.6 */ NOT NULL DEFAULT '0000-00-00 00:00:00.00', - `a3` timestamp(3) /* mysql-5.6 */ NOT NULL DEFAULT '0000-00-00 00:00:00.000', - `a4` timestamp(4) /* mysql-5.6 */ NOT NULL DEFAULT '0000-00-00 00:00:00.0000', - `a5` timestamp(5) /* mysql-5.6 */ NOT NULL DEFAULT '0000-00-00 00:00:00.00000', - `a6` timestamp(6) /* mysql-5.6 */ NOT NULL DEFAULT '0000-00-00 00:00:00.000000' + `a0` timestamp /* mysql-5.6 */ NULL DEFAULT NULL, + `a1` timestamp(1) /* mysql-5.6 */ NULL DEFAULT NULL, + `a2` timestamp(2) /* mysql-5.6 */ NULL DEFAULT NULL, + `a3` timestamp(3) /* mysql-5.6 */ NULL DEFAULT NULL, + `a4` timestamp(4) /* mysql-5.6 */ NULL DEFAULT NULL, + `a5` timestamp(5) /* mysql-5.6 */ NULL DEFAULT NULL, + `a6` timestamp(6) /* mysql-5.6 */ NULL DEFAULT NULL ) ENGINE=MyISAM DEFAULT CHARSET=latin1 DROP TABLE t1; SET @@global.mysql56_temporal_format=DEFAULT; diff --git a/mysql-test/main/type_timestamp.result b/mysql-test/main/type_timestamp.result index a5754e4cfc5..ba78d0fc2a5 100644 --- a/mysql-test/main/type_timestamp.result +++ b/mysql-test/main/type_timestamp.result @@ -1145,7 +1145,7 @@ DROP TABLE t1; # MDEV-17972 Assertion `is_valid_value_slow()' failed in Datetime::Datetime # SET time_zone='+00:00'; -CREATE TABLE t1 (a TIMESTAMP(6)) ENGINE=MyISAM; +CREATE TABLE t1 (a TIMESTAMP(6) NOT NULL) ENGINE=MyISAM; INSERT INTO t1 VALUES ('2001-01-01 10:20:30'); FLUSH TABLES; MYD diff --git a/mysql-test/main/type_timestamp.test b/mysql-test/main/type_timestamp.test index 2c24b7d9d66..e2fd26a21cc 100644 --- a/mysql-test/main/type_timestamp.test +++ b/mysql-test/main/type_timestamp.test @@ -728,7 +728,7 @@ DROP TABLE t1; let $MYSQLD_DATADIR= `select @@datadir`; SET time_zone='+00:00'; -CREATE TABLE t1 (a TIMESTAMP(6)) ENGINE=MyISAM; +CREATE TABLE t1 (a TIMESTAMP(6) NOT NULL) ENGINE=MyISAM; INSERT INTO t1 VALUES ('2001-01-01 10:20:30'); FLUSH TABLES; --remove_file $MYSQLD_DATADIR/test/t1.MYD diff --git a/mysql-test/main/type_timestamp_hires.result b/mysql-test/main/type_timestamp_hires.result index f19b26b09f6..ce5ac769f24 100644 --- a/mysql-test/main/type_timestamp_hires.result +++ b/mysql-test/main/type_timestamp_hires.result @@ -276,19 +276,19 @@ create or replace table t1 (a timestamp(5) default current_timestamp); show create table t1; Table Create Table t1 CREATE TABLE `t1` ( - `a` timestamp(5) NOT NULL DEFAULT current_timestamp(5) + `a` timestamp(5) NULL DEFAULT current_timestamp(5) ) ENGINE=MyISAM DEFAULT CHARSET=latin1 create or replace table t1 (a timestamp(5) default current_timestamp()); show create table t1; Table Create Table t1 CREATE TABLE `t1` ( - `a` timestamp(5) NOT NULL DEFAULT current_timestamp(5) + `a` timestamp(5) NULL DEFAULT current_timestamp(5) ) ENGINE=MyISAM DEFAULT CHARSET=latin1 create or replace table t1 (a timestamp(5) default current_timestamp(2)); show create table t1; Table Create Table t1 CREATE TABLE `t1` ( - `a` timestamp(5) NOT NULL DEFAULT current_timestamp(2) + `a` timestamp(5) NULL DEFAULT current_timestamp(2) ) ENGINE=MyISAM DEFAULT CHARSET=latin1 insert t1 () values (); select * from t1; @@ -298,25 +298,25 @@ create or replace table t1 (a timestamp(5) default current_timestamp(5)); show create table t1; Table Create Table t1 CREATE TABLE `t1` ( - `a` timestamp(5) NOT NULL DEFAULT current_timestamp(5) + `a` timestamp(5) NULL DEFAULT current_timestamp(5) ) ENGINE=MyISAM DEFAULT CHARSET=latin1 create or replace table t1 (a timestamp(5) default current_timestamp(6)); show create table t1; Table Create Table t1 CREATE TABLE `t1` ( - `a` timestamp(5) NOT NULL DEFAULT current_timestamp(5) + `a` timestamp(5) NULL DEFAULT current_timestamp(5) ) ENGINE=MyISAM DEFAULT CHARSET=latin1 create or replace table t1 (a timestamp(5) on update current_timestamp); show create table t1; Table Create Table t1 CREATE TABLE `t1` ( - `a` timestamp(5) NOT NULL DEFAULT '0000-00-00 00:00:00.00000' ON UPDATE current_timestamp(5) + `a` timestamp(5) NULL DEFAULT NULL ON UPDATE current_timestamp(5) ) ENGINE=MyISAM DEFAULT CHARSET=latin1 create or replace table t1 (a timestamp(5) on update current_timestamp()); show create table t1; Table Create Table t1 CREATE TABLE `t1` ( - `a` timestamp(5) NOT NULL DEFAULT '0000-00-00 00:00:00.00000' ON UPDATE current_timestamp(5) + `a` timestamp(5) NULL DEFAULT NULL ON UPDATE current_timestamp(5) ) ENGINE=MyISAM DEFAULT CHARSET=latin1 create or replace table t1 (a timestamp(5) on update current_timestamp(3)); ERROR HY000: Invalid ON UPDATE clause for 'a' column @@ -324,13 +324,13 @@ create or replace table t1 (a timestamp(5) on update current_timestamp(5)); show create table t1; Table Create Table t1 CREATE TABLE `t1` ( - `a` timestamp(5) NOT NULL DEFAULT '0000-00-00 00:00:00.00000' ON UPDATE current_timestamp(5) + `a` timestamp(5) NULL DEFAULT NULL ON UPDATE current_timestamp(5) ) ENGINE=MyISAM DEFAULT CHARSET=latin1 create or replace table t1 (a timestamp(5) on update current_timestamp(6)); show create table t1; Table Create Table t1 CREATE TABLE `t1` ( - `a` timestamp(5) NOT NULL DEFAULT '0000-00-00 00:00:00.00000' ON UPDATE current_timestamp(5) + `a` timestamp(5) NULL DEFAULT NULL ON UPDATE current_timestamp(5) ) ENGINE=MyISAM DEFAULT CHARSET=latin1 drop table t1; # diff --git a/mysql-test/main/user_var-binlog.result b/mysql-test/main/user_var-binlog.result index c07d6d42b98..6743f340a19 100644 --- a/mysql-test/main/user_var-binlog.result +++ b/mysql-test/main/user_var-binlog.result @@ -29,7 +29,7 @@ SET @`a b`:=_latin1 X'68656C6C6F' COLLATE `latin1_swedish_ci`/*!*/; use `test`/*!*/; SET TIMESTAMP=10000/*!*/; SET @@session.pseudo_thread_id=999999999/*!*/; -SET @@session.foreign_key_checks=1, @@session.sql_auto_is_null=0, @@session.unique_checks=1, @@session.autocommit=1, @@session.check_constraint_checks=1, @@session.sql_if_exists=0, @@session.explicit_defaults_for_timestamp=0/*!*/; +SET @@session.foreign_key_checks=1, @@session.sql_auto_is_null=0, @@session.unique_checks=1, @@session.autocommit=1, @@session.check_constraint_checks=1, @@session.sql_if_exists=0, @@session.explicit_defaults_for_timestamp=1/*!*/; SET @@session.sql_mode=1411383296/*!*/; SET @@session.auto_increment_increment=1, @@session.auto_increment_offset=1/*!*/; /*!\C latin1 *//*!*/; diff --git a/mysql-test/suite/binlog/r/binlog_mysqlbinlog2.result b/mysql-test/suite/binlog/r/binlog_mysqlbinlog2.result index d2e904508dc..11abd6e8973 100644 --- a/mysql-test/suite/binlog/r/binlog_mysqlbinlog2.result +++ b/mysql-test/suite/binlog/r/binlog_mysqlbinlog2.result @@ -25,7 +25,7 @@ ROLLBACK/*!*/; use `test`/*!*/; SET TIMESTAMP=1773142/*!*/; SET @@session.pseudo_thread_id=999999999/*!*/; -SET @@session.foreign_key_checks=1, @@session.sql_auto_is_null=0, @@session.unique_checks=1, @@session.autocommit=1, @@session.check_constraint_checks=1, @@session.sql_if_exists=0, @@session.explicit_defaults_for_timestamp=0/*!*/; +SET @@session.foreign_key_checks=1, @@session.sql_auto_is_null=0, @@session.unique_checks=1, @@session.autocommit=1, @@session.check_constraint_checks=1, @@session.sql_if_exists=0, @@session.explicit_defaults_for_timestamp=1/*!*/; SET @@session.sql_mode=0/*!*/; SET @@session.auto_increment_increment=1, @@session.auto_increment_offset=1/*!*/; /*!\C latin1 *//*!*/; @@ -97,7 +97,7 @@ SET INSERT_ID=1/*!*/; use `test`/*!*/; SET TIMESTAMP=1773142/*!*/; SET @@session.pseudo_thread_id=999999999/*!*/; -SET @@session.foreign_key_checks=1, @@session.sql_auto_is_null=0, @@session.unique_checks=1, @@session.autocommit=1, @@session.check_constraint_checks=1, @@session.sql_if_exists=0, @@session.explicit_defaults_for_timestamp=0/*!*/; +SET @@session.foreign_key_checks=1, @@session.sql_auto_is_null=0, @@session.unique_checks=1, @@session.autocommit=1, @@session.check_constraint_checks=1, @@session.sql_if_exists=0, @@session.explicit_defaults_for_timestamp=1/*!*/; SET @@session.sql_mode=0/*!*/; SET @@session.auto_increment_increment=1, @@session.auto_increment_offset=1/*!*/; /*!\C latin1 *//*!*/; @@ -163,7 +163,7 @@ SET INSERT_ID=3/*!*/; use `test`/*!*/; SET TIMESTAMP=1773144/*!*/; SET @@session.pseudo_thread_id=999999999/*!*/; -SET @@session.foreign_key_checks=1, @@session.sql_auto_is_null=0, @@session.unique_checks=1, @@session.autocommit=1, @@session.check_constraint_checks=1, @@session.sql_if_exists=0, @@session.explicit_defaults_for_timestamp=0/*!*/; +SET @@session.foreign_key_checks=1, @@session.sql_auto_is_null=0, @@session.unique_checks=1, @@session.autocommit=1, @@session.check_constraint_checks=1, @@session.sql_if_exists=0, @@session.explicit_defaults_for_timestamp=1/*!*/; SET @@session.sql_mode=0/*!*/; SET @@session.auto_increment_increment=1, @@session.auto_increment_offset=1/*!*/; /*!\C latin1 *//*!*/; @@ -208,7 +208,7 @@ ROLLBACK/*!*/; use `test`/*!*/; SET TIMESTAMP=1773142/*!*/; SET @@session.pseudo_thread_id=999999999/*!*/; -SET @@session.foreign_key_checks=1, @@session.sql_auto_is_null=0, @@session.unique_checks=1, @@session.autocommit=1, @@session.check_constraint_checks=1, @@session.sql_if_exists=0, @@session.explicit_defaults_for_timestamp=0/*!*/; +SET @@session.foreign_key_checks=1, @@session.sql_auto_is_null=0, @@session.unique_checks=1, @@session.autocommit=1, @@session.check_constraint_checks=1, @@session.sql_if_exists=0, @@session.explicit_defaults_for_timestamp=1/*!*/; SET @@session.sql_mode=0/*!*/; SET @@session.auto_increment_increment=1, @@session.auto_increment_offset=1/*!*/; /*!\C latin1 *//*!*/; @@ -253,7 +253,7 @@ SET INSERT_ID=3/*!*/; use `test`/*!*/; SET TIMESTAMP=1773144/*!*/; SET @@session.pseudo_thread_id=999999999/*!*/; -SET @@session.foreign_key_checks=1, @@session.sql_auto_is_null=0, @@session.unique_checks=1, @@session.autocommit=1, @@session.check_constraint_checks=1, @@session.sql_if_exists=0, @@session.explicit_defaults_for_timestamp=0/*!*/; +SET @@session.foreign_key_checks=1, @@session.sql_auto_is_null=0, @@session.unique_checks=1, @@session.autocommit=1, @@session.check_constraint_checks=1, @@session.sql_if_exists=0, @@session.explicit_defaults_for_timestamp=1/*!*/; SET @@session.sql_mode=0/*!*/; SET @@session.auto_increment_increment=1, @@session.auto_increment_offset=1/*!*/; /*!\C latin1 *//*!*/; @@ -280,7 +280,7 @@ SET INSERT_ID=3/*!*/; use `test`/*!*/; SET TIMESTAMP=1773144/*!*/; SET @@session.pseudo_thread_id=999999999/*!*/; -SET @@session.foreign_key_checks=1, @@session.sql_auto_is_null=0, @@session.unique_checks=1, @@session.autocommit=1, @@session.check_constraint_checks=1, @@session.sql_if_exists=0, @@session.explicit_defaults_for_timestamp=0/*!*/; +SET @@session.foreign_key_checks=1, @@session.sql_auto_is_null=0, @@session.unique_checks=1, @@session.autocommit=1, @@session.check_constraint_checks=1, @@session.sql_if_exists=0, @@session.explicit_defaults_for_timestamp=1/*!*/; SET @@session.sql_mode=0/*!*/; SET @@session.auto_increment_increment=1, @@session.auto_increment_offset=1/*!*/; /*!\C latin1 *//*!*/; @@ -325,7 +325,7 @@ ROLLBACK/*!*/; use `test`/*!*/; SET TIMESTAMP=1773142/*!*/; SET @@session.pseudo_thread_id=999999999/*!*/; -SET @@session.foreign_key_checks=1, @@session.sql_auto_is_null=0, @@session.unique_checks=1, @@session.autocommit=1, @@session.check_constraint_checks=1, @@session.sql_if_exists=0, @@session.explicit_defaults_for_timestamp=0/*!*/; +SET @@session.foreign_key_checks=1, @@session.sql_auto_is_null=0, @@session.unique_checks=1, @@session.autocommit=1, @@session.check_constraint_checks=1, @@session.sql_if_exists=0, @@session.explicit_defaults_for_timestamp=1/*!*/; SET @@session.sql_mode=0/*!*/; SET @@session.auto_increment_increment=1, @@session.auto_increment_offset=1/*!*/; /*!\C latin1 *//*!*/; @@ -368,7 +368,7 @@ ROLLBACK/*!*/; use `test`/*!*/; SET TIMESTAMP=1773142/*!*/; SET @@session.pseudo_thread_id=999999999/*!*/; -SET @@session.foreign_key_checks=1, @@session.sql_auto_is_null=0, @@session.unique_checks=1, @@session.autocommit=1, @@session.check_constraint_checks=1, @@session.sql_if_exists=0, @@session.explicit_defaults_for_timestamp=0/*!*/; +SET @@session.foreign_key_checks=1, @@session.sql_auto_is_null=0, @@session.unique_checks=1, @@session.autocommit=1, @@session.check_constraint_checks=1, @@session.sql_if_exists=0, @@session.explicit_defaults_for_timestamp=1/*!*/; SET @@session.sql_mode=0/*!*/; SET @@session.auto_increment_increment=1, @@session.auto_increment_offset=1/*!*/; /*!\C latin1 *//*!*/; @@ -430,7 +430,7 @@ SET INSERT_ID=6/*!*/; use `test`/*!*/; SET TIMESTAMP=1773143/*!*/; SET @@session.pseudo_thread_id=999999999/*!*/; -SET @@session.foreign_key_checks=1, @@session.sql_auto_is_null=0, @@session.unique_checks=1, @@session.autocommit=1, @@session.check_constraint_checks=1, @@session.sql_if_exists=0, @@session.explicit_defaults_for_timestamp=0/*!*/; +SET @@session.foreign_key_checks=1, @@session.sql_auto_is_null=0, @@session.unique_checks=1, @@session.autocommit=1, @@session.check_constraint_checks=1, @@session.sql_if_exists=0, @@session.explicit_defaults_for_timestamp=1/*!*/; SET @@session.sql_mode=0/*!*/; SET @@session.auto_increment_increment=1, @@session.auto_increment_offset=1/*!*/; /*!\C latin1 *//*!*/; @@ -460,7 +460,7 @@ SET INSERT_ID=1/*!*/; use `test`/*!*/; SET TIMESTAMP=1773142/*!*/; SET @@session.pseudo_thread_id=999999999/*!*/; -SET @@session.foreign_key_checks=1, @@session.sql_auto_is_null=0, @@session.unique_checks=1, @@session.autocommit=1, @@session.check_constraint_checks=1, @@session.sql_if_exists=0, @@session.explicit_defaults_for_timestamp=0/*!*/; +SET @@session.foreign_key_checks=1, @@session.sql_auto_is_null=0, @@session.unique_checks=1, @@session.autocommit=1, @@session.check_constraint_checks=1, @@session.sql_if_exists=0, @@session.explicit_defaults_for_timestamp=1/*!*/; SET @@session.sql_mode=0/*!*/; SET @@session.auto_increment_increment=1, @@session.auto_increment_offset=1/*!*/; /*!\C latin1 *//*!*/; @@ -516,7 +516,7 @@ SET INSERT_ID=6/*!*/; use `test`/*!*/; SET TIMESTAMP=1773143/*!*/; SET @@session.pseudo_thread_id=999999999/*!*/; -SET @@session.foreign_key_checks=1, @@session.sql_auto_is_null=0, @@session.unique_checks=1, @@session.autocommit=1, @@session.check_constraint_checks=1, @@session.sql_if_exists=0, @@session.explicit_defaults_for_timestamp=0/*!*/; +SET @@session.foreign_key_checks=1, @@session.sql_auto_is_null=0, @@session.unique_checks=1, @@session.autocommit=1, @@session.check_constraint_checks=1, @@session.sql_if_exists=0, @@session.explicit_defaults_for_timestamp=1/*!*/; SET @@session.sql_mode=0/*!*/; SET @@session.auto_increment_increment=1, @@session.auto_increment_offset=1/*!*/; /*!\C latin1 *//*!*/; @@ -546,7 +546,7 @@ SET INSERT_ID=3/*!*/; use `test`/*!*/; SET TIMESTAMP=1773144/*!*/; SET @@session.pseudo_thread_id=999999999/*!*/; -SET @@session.foreign_key_checks=1, @@session.sql_auto_is_null=0, @@session.unique_checks=1, @@session.autocommit=1, @@session.check_constraint_checks=1, @@session.sql_if_exists=0, @@session.explicit_defaults_for_timestamp=0/*!*/; +SET @@session.foreign_key_checks=1, @@session.sql_auto_is_null=0, @@session.unique_checks=1, @@session.autocommit=1, @@session.check_constraint_checks=1, @@session.sql_if_exists=0, @@session.explicit_defaults_for_timestamp=1/*!*/; SET @@session.sql_mode=0/*!*/; SET @@session.auto_increment_increment=1, @@session.auto_increment_offset=1/*!*/; /*!\C latin1 *//*!*/; @@ -584,7 +584,7 @@ SET INSERT_ID=6/*!*/; use `test`/*!*/; SET TIMESTAMP=1773143/*!*/; SET @@session.pseudo_thread_id=999999999/*!*/; -SET @@session.foreign_key_checks=1, @@session.sql_auto_is_null=0, @@session.unique_checks=1, @@session.autocommit=1, @@session.check_constraint_checks=1, @@session.sql_if_exists=0, @@session.explicit_defaults_for_timestamp=0/*!*/; +SET @@session.foreign_key_checks=1, @@session.sql_auto_is_null=0, @@session.unique_checks=1, @@session.autocommit=1, @@session.check_constraint_checks=1, @@session.sql_if_exists=0, @@session.explicit_defaults_for_timestamp=1/*!*/; SET @@session.sql_mode=0/*!*/; SET @@session.auto_increment_increment=1, @@session.auto_increment_offset=1/*!*/; /*!\C latin1 *//*!*/; @@ -611,7 +611,7 @@ ROLLBACK/*!*/; use `test`/*!*/; SET TIMESTAMP=1773142/*!*/; SET @@session.pseudo_thread_id=999999999/*!*/; -SET @@session.foreign_key_checks=1, @@session.sql_auto_is_null=0, @@session.unique_checks=1, @@session.autocommit=1, @@session.check_constraint_checks=1, @@session.sql_if_exists=0, @@session.explicit_defaults_for_timestamp=0/*!*/; +SET @@session.foreign_key_checks=1, @@session.sql_auto_is_null=0, @@session.unique_checks=1, @@session.autocommit=1, @@session.check_constraint_checks=1, @@session.sql_if_exists=0, @@session.explicit_defaults_for_timestamp=1/*!*/; SET @@session.sql_mode=0/*!*/; SET @@session.auto_increment_increment=1, @@session.auto_increment_offset=1/*!*/; /*!\C latin1 *//*!*/; @@ -687,7 +687,7 @@ SET INSERT_ID=3/*!*/; use `test`/*!*/; SET TIMESTAMP=1773144/*!*/; SET @@session.pseudo_thread_id=999999999/*!*/; -SET @@session.foreign_key_checks=1, @@session.sql_auto_is_null=0, @@session.unique_checks=1, @@session.autocommit=1, @@session.check_constraint_checks=1, @@session.sql_if_exists=0, @@session.explicit_defaults_for_timestamp=0/*!*/; +SET @@session.foreign_key_checks=1, @@session.sql_auto_is_null=0, @@session.unique_checks=1, @@session.autocommit=1, @@session.check_constraint_checks=1, @@session.sql_if_exists=0, @@session.explicit_defaults_for_timestamp=1/*!*/; SET @@session.sql_mode=0/*!*/; SET @@session.auto_increment_increment=1, @@session.auto_increment_offset=1/*!*/; /*!\C latin1 *//*!*/; @@ -725,7 +725,7 @@ SET INSERT_ID=6/*!*/; use `test`/*!*/; SET TIMESTAMP=1773143/*!*/; SET @@session.pseudo_thread_id=999999999/*!*/; -SET @@session.foreign_key_checks=1, @@session.sql_auto_is_null=0, @@session.unique_checks=1, @@session.autocommit=1, @@session.check_constraint_checks=1, @@session.sql_if_exists=0, @@session.explicit_defaults_for_timestamp=0/*!*/; +SET @@session.foreign_key_checks=1, @@session.sql_auto_is_null=0, @@session.unique_checks=1, @@session.autocommit=1, @@session.check_constraint_checks=1, @@session.sql_if_exists=0, @@session.explicit_defaults_for_timestamp=1/*!*/; SET @@session.sql_mode=0/*!*/; SET @@session.auto_increment_increment=1, @@session.auto_increment_offset=1/*!*/; /*!\C latin1 *//*!*/; @@ -752,7 +752,7 @@ ROLLBACK/*!*/; use `test`/*!*/; SET TIMESTAMP=1773142/*!*/; SET @@session.pseudo_thread_id=999999999/*!*/; -SET @@session.foreign_key_checks=1, @@session.sql_auto_is_null=0, @@session.unique_checks=1, @@session.autocommit=1, @@session.check_constraint_checks=1, @@session.sql_if_exists=0, @@session.explicit_defaults_for_timestamp=0/*!*/; +SET @@session.foreign_key_checks=1, @@session.sql_auto_is_null=0, @@session.unique_checks=1, @@session.autocommit=1, @@session.check_constraint_checks=1, @@session.sql_if_exists=0, @@session.explicit_defaults_for_timestamp=1/*!*/; SET @@session.sql_mode=0/*!*/; SET @@session.auto_increment_increment=1, @@session.auto_increment_offset=1/*!*/; /*!\C latin1 *//*!*/; @@ -794,7 +794,7 @@ ROLLBACK/*!*/; use `test`/*!*/; SET TIMESTAMP=1773142/*!*/; SET @@session.pseudo_thread_id=999999999/*!*/; -SET @@session.foreign_key_checks=1, @@session.sql_auto_is_null=0, @@session.unique_checks=1, @@session.autocommit=1, @@session.check_constraint_checks=1, @@session.sql_if_exists=0, @@session.explicit_defaults_for_timestamp=0/*!*/; +SET @@session.foreign_key_checks=1, @@session.sql_auto_is_null=0, @@session.unique_checks=1, @@session.autocommit=1, @@session.check_constraint_checks=1, @@session.sql_if_exists=0, @@session.explicit_defaults_for_timestamp=1/*!*/; SET @@session.sql_mode=0/*!*/; SET @@session.auto_increment_increment=1, @@session.auto_increment_offset=1/*!*/; /*!\C latin1 *//*!*/; @@ -866,7 +866,7 @@ SET INSERT_ID=1/*!*/; use `test`/*!*/; SET TIMESTAMP=1773142/*!*/; SET @@session.pseudo_thread_id=999999999/*!*/; -SET @@session.foreign_key_checks=1, @@session.sql_auto_is_null=0, @@session.unique_checks=1, @@session.autocommit=1, @@session.check_constraint_checks=1, @@session.sql_if_exists=0, @@session.explicit_defaults_for_timestamp=0/*!*/; +SET @@session.foreign_key_checks=1, @@session.sql_auto_is_null=0, @@session.unique_checks=1, @@session.autocommit=1, @@session.check_constraint_checks=1, @@session.sql_if_exists=0, @@session.explicit_defaults_for_timestamp=1/*!*/; SET @@session.sql_mode=0/*!*/; SET @@session.auto_increment_increment=1, @@session.auto_increment_offset=1/*!*/; /*!\C latin1 *//*!*/; @@ -931,7 +931,7 @@ SET INSERT_ID=3/*!*/; use `test`/*!*/; SET TIMESTAMP=1773144/*!*/; SET @@session.pseudo_thread_id=999999999/*!*/; -SET @@session.foreign_key_checks=1, @@session.sql_auto_is_null=0, @@session.unique_checks=1, @@session.autocommit=1, @@session.check_constraint_checks=1, @@session.sql_if_exists=0, @@session.explicit_defaults_for_timestamp=0/*!*/; +SET @@session.foreign_key_checks=1, @@session.sql_auto_is_null=0, @@session.unique_checks=1, @@session.autocommit=1, @@session.check_constraint_checks=1, @@session.sql_if_exists=0, @@session.explicit_defaults_for_timestamp=1/*!*/; SET @@session.sql_mode=0/*!*/; SET @@session.auto_increment_increment=1, @@session.auto_increment_offset=1/*!*/; /*!\C latin1 *//*!*/; @@ -976,7 +976,7 @@ ROLLBACK/*!*/; use `test`/*!*/; SET TIMESTAMP=1773142/*!*/; SET @@session.pseudo_thread_id=999999999/*!*/; -SET @@session.foreign_key_checks=1, @@session.sql_auto_is_null=0, @@session.unique_checks=1, @@session.autocommit=1, @@session.check_constraint_checks=1, @@session.sql_if_exists=0, @@session.explicit_defaults_for_timestamp=0/*!*/; +SET @@session.foreign_key_checks=1, @@session.sql_auto_is_null=0, @@session.unique_checks=1, @@session.autocommit=1, @@session.check_constraint_checks=1, @@session.sql_if_exists=0, @@session.explicit_defaults_for_timestamp=1/*!*/; SET @@session.sql_mode=0/*!*/; SET @@session.auto_increment_increment=1, @@session.auto_increment_offset=1/*!*/; /*!\C latin1 *//*!*/; @@ -1020,7 +1020,7 @@ SET INSERT_ID=3/*!*/; use `test`/*!*/; SET TIMESTAMP=1773144/*!*/; SET @@session.pseudo_thread_id=999999999/*!*/; -SET @@session.foreign_key_checks=1, @@session.sql_auto_is_null=0, @@session.unique_checks=1, @@session.autocommit=1, @@session.check_constraint_checks=1, @@session.sql_if_exists=0, @@session.explicit_defaults_for_timestamp=0/*!*/; +SET @@session.foreign_key_checks=1, @@session.sql_auto_is_null=0, @@session.unique_checks=1, @@session.autocommit=1, @@session.check_constraint_checks=1, @@session.sql_if_exists=0, @@session.explicit_defaults_for_timestamp=1/*!*/; SET @@session.sql_mode=0/*!*/; SET @@session.auto_increment_increment=1, @@session.auto_increment_offset=1/*!*/; /*!\C latin1 *//*!*/; @@ -1047,7 +1047,7 @@ SET INSERT_ID=3/*!*/; use `test`/*!*/; SET TIMESTAMP=1773144/*!*/; SET @@session.pseudo_thread_id=999999999/*!*/; -SET @@session.foreign_key_checks=1, @@session.sql_auto_is_null=0, @@session.unique_checks=1, @@session.autocommit=1, @@session.check_constraint_checks=1, @@session.sql_if_exists=0, @@session.explicit_defaults_for_timestamp=0/*!*/; +SET @@session.foreign_key_checks=1, @@session.sql_auto_is_null=0, @@session.unique_checks=1, @@session.autocommit=1, @@session.check_constraint_checks=1, @@session.sql_if_exists=0, @@session.explicit_defaults_for_timestamp=1/*!*/; SET @@session.sql_mode=0/*!*/; SET @@session.auto_increment_increment=1, @@session.auto_increment_offset=1/*!*/; /*!\C latin1 *//*!*/; @@ -1092,7 +1092,7 @@ ROLLBACK/*!*/; use `test`/*!*/; SET TIMESTAMP=1773142/*!*/; SET @@session.pseudo_thread_id=999999999/*!*/; -SET @@session.foreign_key_checks=1, @@session.sql_auto_is_null=0, @@session.unique_checks=1, @@session.autocommit=1, @@session.check_constraint_checks=1, @@session.sql_if_exists=0, @@session.explicit_defaults_for_timestamp=0/*!*/; +SET @@session.foreign_key_checks=1, @@session.sql_auto_is_null=0, @@session.unique_checks=1, @@session.autocommit=1, @@session.check_constraint_checks=1, @@session.sql_if_exists=0, @@session.explicit_defaults_for_timestamp=1/*!*/; SET @@session.sql_mode=0/*!*/; SET @@session.auto_increment_increment=1, @@session.auto_increment_offset=1/*!*/; /*!\C latin1 *//*!*/; @@ -1134,7 +1134,7 @@ ROLLBACK/*!*/; use `test`/*!*/; SET TIMESTAMP=1773142/*!*/; SET @@session.pseudo_thread_id=999999999/*!*/; -SET @@session.foreign_key_checks=1, @@session.sql_auto_is_null=0, @@session.unique_checks=1, @@session.autocommit=1, @@session.check_constraint_checks=1, @@session.sql_if_exists=0, @@session.explicit_defaults_for_timestamp=0/*!*/; +SET @@session.foreign_key_checks=1, @@session.sql_auto_is_null=0, @@session.unique_checks=1, @@session.autocommit=1, @@session.check_constraint_checks=1, @@session.sql_if_exists=0, @@session.explicit_defaults_for_timestamp=1/*!*/; SET @@session.sql_mode=0/*!*/; SET @@session.auto_increment_increment=1, @@session.auto_increment_offset=1/*!*/; /*!\C latin1 *//*!*/; @@ -1196,7 +1196,7 @@ SET INSERT_ID=6/*!*/; use `test`/*!*/; SET TIMESTAMP=1773143/*!*/; SET @@session.pseudo_thread_id=999999999/*!*/; -SET @@session.foreign_key_checks=1, @@session.sql_auto_is_null=0, @@session.unique_checks=1, @@session.autocommit=1, @@session.check_constraint_checks=1, @@session.sql_if_exists=0, @@session.explicit_defaults_for_timestamp=0/*!*/; +SET @@session.foreign_key_checks=1, @@session.sql_auto_is_null=0, @@session.unique_checks=1, @@session.autocommit=1, @@session.check_constraint_checks=1, @@session.sql_if_exists=0, @@session.explicit_defaults_for_timestamp=1/*!*/; SET @@session.sql_mode=0/*!*/; SET @@session.auto_increment_increment=1, @@session.auto_increment_offset=1/*!*/; /*!\C latin1 *//*!*/; @@ -1226,7 +1226,7 @@ SET INSERT_ID=1/*!*/; use `test`/*!*/; SET TIMESTAMP=1773142/*!*/; SET @@session.pseudo_thread_id=999999999/*!*/; -SET @@session.foreign_key_checks=1, @@session.sql_auto_is_null=0, @@session.unique_checks=1, @@session.autocommit=1, @@session.check_constraint_checks=1, @@session.sql_if_exists=0, @@session.explicit_defaults_for_timestamp=0/*!*/; +SET @@session.foreign_key_checks=1, @@session.sql_auto_is_null=0, @@session.unique_checks=1, @@session.autocommit=1, @@session.check_constraint_checks=1, @@session.sql_if_exists=0, @@session.explicit_defaults_for_timestamp=1/*!*/; SET @@session.sql_mode=0/*!*/; SET @@session.auto_increment_increment=1, @@session.auto_increment_offset=1/*!*/; /*!\C latin1 *//*!*/; @@ -1282,7 +1282,7 @@ SET INSERT_ID=6/*!*/; use `test`/*!*/; SET TIMESTAMP=1773143/*!*/; SET @@session.pseudo_thread_id=999999999/*!*/; -SET @@session.foreign_key_checks=1, @@session.sql_auto_is_null=0, @@session.unique_checks=1, @@session.autocommit=1, @@session.check_constraint_checks=1, @@session.sql_if_exists=0, @@session.explicit_defaults_for_timestamp=0/*!*/; +SET @@session.foreign_key_checks=1, @@session.sql_auto_is_null=0, @@session.unique_checks=1, @@session.autocommit=1, @@session.check_constraint_checks=1, @@session.sql_if_exists=0, @@session.explicit_defaults_for_timestamp=1/*!*/; SET @@session.sql_mode=0/*!*/; SET @@session.auto_increment_increment=1, @@session.auto_increment_offset=1/*!*/; /*!\C latin1 *//*!*/; @@ -1311,7 +1311,7 @@ SET INSERT_ID=3/*!*/; use `test`/*!*/; SET TIMESTAMP=1773144/*!*/; SET @@session.pseudo_thread_id=999999999/*!*/; -SET @@session.foreign_key_checks=1, @@session.sql_auto_is_null=0, @@session.unique_checks=1, @@session.autocommit=1, @@session.check_constraint_checks=1, @@session.sql_if_exists=0, @@session.explicit_defaults_for_timestamp=0/*!*/; +SET @@session.foreign_key_checks=1, @@session.sql_auto_is_null=0, @@session.unique_checks=1, @@session.autocommit=1, @@session.check_constraint_checks=1, @@session.sql_if_exists=0, @@session.explicit_defaults_for_timestamp=1/*!*/; SET @@session.sql_mode=0/*!*/; SET @@session.auto_increment_increment=1, @@session.auto_increment_offset=1/*!*/; /*!\C latin1 *//*!*/; @@ -1349,7 +1349,7 @@ SET INSERT_ID=6/*!*/; use `test`/*!*/; SET TIMESTAMP=1773143/*!*/; SET @@session.pseudo_thread_id=999999999/*!*/; -SET @@session.foreign_key_checks=1, @@session.sql_auto_is_null=0, @@session.unique_checks=1, @@session.autocommit=1, @@session.check_constraint_checks=1, @@session.sql_if_exists=0, @@session.explicit_defaults_for_timestamp=0/*!*/; +SET @@session.foreign_key_checks=1, @@session.sql_auto_is_null=0, @@session.unique_checks=1, @@session.autocommit=1, @@session.check_constraint_checks=1, @@session.sql_if_exists=0, @@session.explicit_defaults_for_timestamp=1/*!*/; SET @@session.sql_mode=0/*!*/; SET @@session.auto_increment_increment=1, @@session.auto_increment_offset=1/*!*/; /*!\C latin1 *//*!*/; @@ -1376,7 +1376,7 @@ ROLLBACK/*!*/; use `test`/*!*/; SET TIMESTAMP=1773142/*!*/; SET @@session.pseudo_thread_id=999999999/*!*/; -SET @@session.foreign_key_checks=1, @@session.sql_auto_is_null=0, @@session.unique_checks=1, @@session.autocommit=1, @@session.check_constraint_checks=1, @@session.sql_if_exists=0, @@session.explicit_defaults_for_timestamp=0/*!*/; +SET @@session.foreign_key_checks=1, @@session.sql_auto_is_null=0, @@session.unique_checks=1, @@session.autocommit=1, @@session.check_constraint_checks=1, @@session.sql_if_exists=0, @@session.explicit_defaults_for_timestamp=1/*!*/; SET @@session.sql_mode=0/*!*/; SET @@session.auto_increment_increment=1, @@session.auto_increment_offset=1/*!*/; /*!\C latin1 *//*!*/; @@ -1450,7 +1450,7 @@ SET INSERT_ID=3/*!*/; use `test`/*!*/; SET TIMESTAMP=1773144/*!*/; SET @@session.pseudo_thread_id=999999999/*!*/; -SET @@session.foreign_key_checks=1, @@session.sql_auto_is_null=0, @@session.unique_checks=1, @@session.autocommit=1, @@session.check_constraint_checks=1, @@session.sql_if_exists=0, @@session.explicit_defaults_for_timestamp=0/*!*/; +SET @@session.foreign_key_checks=1, @@session.sql_auto_is_null=0, @@session.unique_checks=1, @@session.autocommit=1, @@session.check_constraint_checks=1, @@session.sql_if_exists=0, @@session.explicit_defaults_for_timestamp=1/*!*/; SET @@session.sql_mode=0/*!*/; SET @@session.auto_increment_increment=1, @@session.auto_increment_offset=1/*!*/; /*!\C latin1 *//*!*/; @@ -1488,7 +1488,7 @@ SET INSERT_ID=6/*!*/; use `test`/*!*/; SET TIMESTAMP=1773143/*!*/; SET @@session.pseudo_thread_id=999999999/*!*/; -SET @@session.foreign_key_checks=1, @@session.sql_auto_is_null=0, @@session.unique_checks=1, @@session.autocommit=1, @@session.check_constraint_checks=1, @@session.sql_if_exists=0, @@session.explicit_defaults_for_timestamp=0/*!*/; +SET @@session.foreign_key_checks=1, @@session.sql_auto_is_null=0, @@session.unique_checks=1, @@session.autocommit=1, @@session.check_constraint_checks=1, @@session.sql_if_exists=0, @@session.explicit_defaults_for_timestamp=1/*!*/; SET @@session.sql_mode=0/*!*/; SET @@session.auto_increment_increment=1, @@session.auto_increment_offset=1/*!*/; /*!\C latin1 *//*!*/; @@ -1515,7 +1515,7 @@ ROLLBACK/*!*/; use `test`/*!*/; SET TIMESTAMP=1773142/*!*/; SET @@session.pseudo_thread_id=999999999/*!*/; -SET @@session.foreign_key_checks=1, @@session.sql_auto_is_null=0, @@session.unique_checks=1, @@session.autocommit=1, @@session.check_constraint_checks=1, @@session.sql_if_exists=0, @@session.explicit_defaults_for_timestamp=0/*!*/; +SET @@session.foreign_key_checks=1, @@session.sql_auto_is_null=0, @@session.unique_checks=1, @@session.autocommit=1, @@session.check_constraint_checks=1, @@session.sql_if_exists=0, @@session.explicit_defaults_for_timestamp=1/*!*/; SET @@session.sql_mode=0/*!*/; SET @@session.auto_increment_increment=1, @@session.auto_increment_offset=1/*!*/; /*!\C latin1 *//*!*/; @@ -1557,7 +1557,7 @@ ROLLBACK/*!*/; use `test`/*!*/; SET TIMESTAMP=1773142/*!*/; SET @@session.pseudo_thread_id=999999999/*!*/; -SET @@session.foreign_key_checks=1, @@session.sql_auto_is_null=0, @@session.unique_checks=1, @@session.autocommit=1, @@session.check_constraint_checks=1, @@session.sql_if_exists=0, @@session.explicit_defaults_for_timestamp=0/*!*/; +SET @@session.foreign_key_checks=1, @@session.sql_auto_is_null=0, @@session.unique_checks=1, @@session.autocommit=1, @@session.check_constraint_checks=1, @@session.sql_if_exists=0, @@session.explicit_defaults_for_timestamp=1/*!*/; SET @@session.sql_mode=0/*!*/; SET @@session.auto_increment_increment=1, @@session.auto_increment_offset=1/*!*/; /*!\C latin1 *//*!*/; diff --git a/mysql-test/suite/binlog/r/binlog_mysqlbinlog_row.result b/mysql-test/suite/binlog/r/binlog_mysqlbinlog_row.result index 9195f9fd3ad..816084d7464 100644 --- a/mysql-test/suite/binlog/r/binlog_mysqlbinlog_row.result +++ b/mysql-test/suite/binlog/r/binlog_mysqlbinlog_row.result @@ -376,7 +376,7 @@ ROLLBACK/*!*/; use `test`/*!*/; SET TIMESTAMP=1000000000/*!*/; SET @@session.pseudo_thread_id=#/*!*/; -SET @@session.foreign_key_checks=1, @@session.sql_auto_is_null=0, @@session.unique_checks=1, @@session.autocommit=1, @@session.check_constraint_checks=1, @@session.sql_if_exists=0, @@session.explicit_defaults_for_timestamp=0/*!*/; +SET @@session.foreign_key_checks=1, @@session.sql_auto_is_null=0, @@session.unique_checks=1, @@session.autocommit=1, @@session.check_constraint_checks=1, @@session.sql_if_exists=0, @@session.explicit_defaults_for_timestamp=1/*!*/; SET @@session.sql_mode=1411383296/*!*/; SET @@session.auto_increment_increment=1, @@session.auto_increment_offset=1/*!*/; /*!\C latin1 *//*!*/; @@ -5386,7 +5386,7 @@ DELIMITER /*!*/; use `test`/*!*/; SET TIMESTAMP=1000000000/*!*/; SET @@session.pseudo_thread_id=#/*!*/; -SET @@session.foreign_key_checks=1, @@session.sql_auto_is_null=0, @@session.unique_checks=1, @@session.autocommit=1, @@session.check_constraint_checks=1, @@session.sql_if_exists=0, @@session.explicit_defaults_for_timestamp=0/*!*/; +SET @@session.foreign_key_checks=1, @@session.sql_auto_is_null=0, @@session.unique_checks=1, @@session.autocommit=1, @@session.check_constraint_checks=1, @@session.sql_if_exists=0, @@session.explicit_defaults_for_timestamp=1/*!*/; SET @@session.sql_mode=1411383296/*!*/; SET @@session.auto_increment_increment=1, @@session.auto_increment_offset=1/*!*/; /*!\C latin1 *//*!*/; diff --git a/mysql-test/suite/binlog/r/binlog_mysqlbinlog_row_innodb.result b/mysql-test/suite/binlog/r/binlog_mysqlbinlog_row_innodb.result index 96059d009c0..65e2f824e39 100644 --- a/mysql-test/suite/binlog/r/binlog_mysqlbinlog_row_innodb.result +++ b/mysql-test/suite/binlog/r/binlog_mysqlbinlog_row_innodb.result @@ -2270,7 +2270,7 @@ ROLLBACK/*!*/; use `test`/*!*/; SET TIMESTAMP=1000000000/*!*/; SET @@session.pseudo_thread_id=#/*!*/; -SET @@session.foreign_key_checks=1, @@session.sql_auto_is_null=0, @@session.unique_checks=1, @@session.autocommit=1, @@session.check_constraint_checks=1, @@session.sql_if_exists=0, @@session.explicit_defaults_for_timestamp=0/*!*/; +SET @@session.foreign_key_checks=1, @@session.sql_auto_is_null=0, @@session.unique_checks=1, @@session.autocommit=1, @@session.check_constraint_checks=1, @@session.sql_if_exists=0, @@session.explicit_defaults_for_timestamp=1/*!*/; SET @@session.sql_mode=0/*!*/; SET @@session.auto_increment_increment=1, @@session.auto_increment_offset=1/*!*/; /*!\C utf8mb3 *//*!*/; @@ -5279,7 +5279,7 @@ ROLLBACK/*!*/; use `test`/*!*/; SET TIMESTAMP=1000000000/*!*/; SET @@session.pseudo_thread_id=#/*!*/; -SET @@session.foreign_key_checks=1, @@session.sql_auto_is_null=0, @@session.unique_checks=1, @@session.autocommit=1, @@session.check_constraint_checks=1, @@session.sql_if_exists=0, @@session.explicit_defaults_for_timestamp=0/*!*/; +SET @@session.foreign_key_checks=1, @@session.sql_auto_is_null=0, @@session.unique_checks=1, @@session.autocommit=1, @@session.check_constraint_checks=1, @@session.sql_if_exists=0, @@session.explicit_defaults_for_timestamp=1/*!*/; SET @@session.sql_mode=0/*!*/; SET @@session.auto_increment_increment=1, @@session.auto_increment_offset=1/*!*/; /*!\C utf8mb3 *//*!*/; @@ -5679,7 +5679,7 @@ ROLLBACK/*!*/; use `test`/*!*/; SET TIMESTAMP=1000000000/*!*/; SET @@session.pseudo_thread_id=#/*!*/; -SET @@session.foreign_key_checks=1, @@session.sql_auto_is_null=0, @@session.unique_checks=1, @@session.autocommit=1, @@session.check_constraint_checks=1, @@session.sql_if_exists=0, @@session.explicit_defaults_for_timestamp=0/*!*/; +SET @@session.foreign_key_checks=1, @@session.sql_auto_is_null=0, @@session.unique_checks=1, @@session.autocommit=1, @@session.check_constraint_checks=1, @@session.sql_if_exists=0, @@session.explicit_defaults_for_timestamp=1/*!*/; SET @@session.sql_mode=0/*!*/; SET @@session.auto_increment_increment=1, @@session.auto_increment_offset=1/*!*/; /*!\C utf8mb3 *//*!*/; @@ -6317,7 +6317,7 @@ ROLLBACK/*!*/; use `test`/*!*/; SET TIMESTAMP=1000000000/*!*/; SET @@session.pseudo_thread_id=#/*!*/; -SET @@session.foreign_key_checks=1, @@session.sql_auto_is_null=0, @@session.unique_checks=1, @@session.autocommit=1, @@session.check_constraint_checks=1, @@session.sql_if_exists=0, @@session.explicit_defaults_for_timestamp=0/*!*/; +SET @@session.foreign_key_checks=1, @@session.sql_auto_is_null=0, @@session.unique_checks=1, @@session.autocommit=1, @@session.check_constraint_checks=1, @@session.sql_if_exists=0, @@session.explicit_defaults_for_timestamp=1/*!*/; SET @@session.sql_mode=0/*!*/; SET @@session.auto_increment_increment=1, @@session.auto_increment_offset=1/*!*/; /*!\C utf8mb3 *//*!*/; diff --git a/mysql-test/suite/binlog/r/binlog_mysqlbinlog_row_myisam.result b/mysql-test/suite/binlog/r/binlog_mysqlbinlog_row_myisam.result index 630a9f1d381..3f838c8c369 100644 --- a/mysql-test/suite/binlog/r/binlog_mysqlbinlog_row_myisam.result +++ b/mysql-test/suite/binlog/r/binlog_mysqlbinlog_row_myisam.result @@ -2268,7 +2268,7 @@ ROLLBACK/*!*/; use `test`/*!*/; SET TIMESTAMP=1000000000/*!*/; SET @@session.pseudo_thread_id=#/*!*/; -SET @@session.foreign_key_checks=1, @@session.sql_auto_is_null=0, @@session.unique_checks=1, @@session.autocommit=1, @@session.check_constraint_checks=1, @@session.sql_if_exists=0, @@session.explicit_defaults_for_timestamp=0/*!*/; +SET @@session.foreign_key_checks=1, @@session.sql_auto_is_null=0, @@session.unique_checks=1, @@session.autocommit=1, @@session.check_constraint_checks=1, @@session.sql_if_exists=0, @@session.explicit_defaults_for_timestamp=1/*!*/; SET @@session.sql_mode=0/*!*/; SET @@session.auto_increment_increment=1, @@session.auto_increment_offset=1/*!*/; /*!\C utf8mb3 *//*!*/; @@ -5300,7 +5300,7 @@ ROLLBACK/*!*/; use `test`/*!*/; SET TIMESTAMP=1000000000/*!*/; SET @@session.pseudo_thread_id=#/*!*/; -SET @@session.foreign_key_checks=1, @@session.sql_auto_is_null=0, @@session.unique_checks=1, @@session.autocommit=1, @@session.check_constraint_checks=1, @@session.sql_if_exists=0, @@session.explicit_defaults_for_timestamp=0/*!*/; +SET @@session.foreign_key_checks=1, @@session.sql_auto_is_null=0, @@session.unique_checks=1, @@session.autocommit=1, @@session.check_constraint_checks=1, @@session.sql_if_exists=0, @@session.explicit_defaults_for_timestamp=1/*!*/; SET @@session.sql_mode=0/*!*/; SET @@session.auto_increment_increment=1, @@session.auto_increment_offset=1/*!*/; /*!\C utf8mb3 *//*!*/; @@ -5706,7 +5706,7 @@ ROLLBACK/*!*/; use `test`/*!*/; SET TIMESTAMP=1000000000/*!*/; SET @@session.pseudo_thread_id=#/*!*/; -SET @@session.foreign_key_checks=1, @@session.sql_auto_is_null=0, @@session.unique_checks=1, @@session.autocommit=1, @@session.check_constraint_checks=1, @@session.sql_if_exists=0, @@session.explicit_defaults_for_timestamp=0/*!*/; +SET @@session.foreign_key_checks=1, @@session.sql_auto_is_null=0, @@session.unique_checks=1, @@session.autocommit=1, @@session.check_constraint_checks=1, @@session.sql_if_exists=0, @@session.explicit_defaults_for_timestamp=1/*!*/; SET @@session.sql_mode=0/*!*/; SET @@session.auto_increment_increment=1, @@session.auto_increment_offset=1/*!*/; /*!\C utf8mb3 *//*!*/; @@ -6354,7 +6354,7 @@ ROLLBACK/*!*/; use `test`/*!*/; SET TIMESTAMP=1000000000/*!*/; SET @@session.pseudo_thread_id=#/*!*/; -SET @@session.foreign_key_checks=1, @@session.sql_auto_is_null=0, @@session.unique_checks=1, @@session.autocommit=1, @@session.check_constraint_checks=1, @@session.sql_if_exists=0, @@session.explicit_defaults_for_timestamp=0/*!*/; +SET @@session.foreign_key_checks=1, @@session.sql_auto_is_null=0, @@session.unique_checks=1, @@session.autocommit=1, @@session.check_constraint_checks=1, @@session.sql_if_exists=0, @@session.explicit_defaults_for_timestamp=1/*!*/; SET @@session.sql_mode=0/*!*/; SET @@session.auto_increment_increment=1, @@session.auto_increment_offset=1/*!*/; /*!\C utf8mb3 *//*!*/; diff --git a/mysql-test/suite/binlog/r/binlog_mysqlbinlog_row_trans.result b/mysql-test/suite/binlog/r/binlog_mysqlbinlog_row_trans.result index 748b92df1a8..5a27afaae71 100644 --- a/mysql-test/suite/binlog/r/binlog_mysqlbinlog_row_trans.result +++ b/mysql-test/suite/binlog/r/binlog_mysqlbinlog_row_trans.result @@ -146,7 +146,7 @@ ROLLBACK/*!*/; use `test`/*!*/; SET TIMESTAMP=1000000000/*!*/; SET @@session.pseudo_thread_id=#/*!*/; -SET @@session.foreign_key_checks=1, @@session.sql_auto_is_null=0, @@session.unique_checks=1, @@session.autocommit=1, @@session.check_constraint_checks=1, @@session.sql_if_exists=0, @@session.explicit_defaults_for_timestamp=0/*!*/; +SET @@session.foreign_key_checks=1, @@session.sql_auto_is_null=0, @@session.unique_checks=1, @@session.autocommit=1, @@session.check_constraint_checks=1, @@session.sql_if_exists=0, @@session.explicit_defaults_for_timestamp=1/*!*/; SET @@session.sql_mode=1411383296/*!*/; SET @@session.auto_increment_increment=1, @@session.auto_increment_offset=1/*!*/; /*!\C latin1 *//*!*/; diff --git a/mysql-test/suite/binlog/r/binlog_row_annotate.result b/mysql-test/suite/binlog/r/binlog_row_annotate.result index ffdb31cdbeb..bf114d8cfa9 100644 --- a/mysql-test/suite/binlog/r/binlog_row_annotate.result +++ b/mysql-test/suite/binlog/r/binlog_row_annotate.result @@ -116,7 +116,7 @@ ROLLBACK/*!*/; #010909 4:46:40 server id # end_log_pos # Query thread_id=# exec_time=# error_code=0 xid=<xid> SET TIMESTAMP=1000000000/*!*/; SET @@session.pseudo_thread_id=#/*!*/; -SET @@session.foreign_key_checks=1, @@session.sql_auto_is_null=0, @@session.unique_checks=1, @@session.autocommit=1, @@session.check_constraint_checks=1, @@session.sql_if_exists=0, @@session.explicit_defaults_for_timestamp=0/*!*/; +SET @@session.foreign_key_checks=1, @@session.sql_auto_is_null=0, @@session.unique_checks=1, @@session.autocommit=1, @@session.check_constraint_checks=1, @@session.sql_if_exists=0, @@session.explicit_defaults_for_timestamp=1/*!*/; SET @@session.sql_mode=0/*!*/; SET @@session.auto_increment_increment=1, @@session.auto_increment_offset=1/*!*/; /*!\C latin1 *//*!*/; @@ -354,7 +354,7 @@ ROLLBACK/*!*/; #010909 4:46:40 server id # end_log_pos # Query thread_id=# exec_time=# error_code=0 xid=<xid> SET TIMESTAMP=1000000000/*!*/; SET @@session.pseudo_thread_id=#/*!*/; -SET @@session.foreign_key_checks=1, @@session.sql_auto_is_null=0, @@session.unique_checks=1, @@session.autocommit=1, @@session.check_constraint_checks=1, @@session.sql_if_exists=0, @@session.explicit_defaults_for_timestamp=0/*!*/; +SET @@session.foreign_key_checks=1, @@session.sql_auto_is_null=0, @@session.unique_checks=1, @@session.autocommit=1, @@session.check_constraint_checks=1, @@session.sql_if_exists=0, @@session.explicit_defaults_for_timestamp=1/*!*/; SET @@session.sql_mode=0/*!*/; SET @@session.auto_increment_increment=1, @@session.auto_increment_offset=1/*!*/; /*!\C latin1 *//*!*/; @@ -513,7 +513,7 @@ ROLLBACK/*!*/; #010909 4:46:40 server id # end_log_pos # Query thread_id=# exec_time=# error_code=0 xid=<xid> SET TIMESTAMP=1000000000/*!*/; SET @@session.pseudo_thread_id=#/*!*/; -SET @@session.foreign_key_checks=1, @@session.sql_auto_is_null=0, @@session.unique_checks=1, @@session.autocommit=1, @@session.check_constraint_checks=1, @@session.sql_if_exists=0, @@session.explicit_defaults_for_timestamp=0/*!*/; +SET @@session.foreign_key_checks=1, @@session.sql_auto_is_null=0, @@session.unique_checks=1, @@session.autocommit=1, @@session.check_constraint_checks=1, @@session.sql_if_exists=0, @@session.explicit_defaults_for_timestamp=1/*!*/; SET @@session.sql_mode=0/*!*/; SET @@session.auto_increment_increment=1, @@session.auto_increment_offset=1/*!*/; /*!\C latin1 *//*!*/; @@ -739,7 +739,7 @@ ROLLBACK/*!*/; #010909 4:46:40 server id # end_log_pos # Query thread_id=# exec_time=# error_code=0 xid=<xid> SET TIMESTAMP=1000000000/*!*/; SET @@session.pseudo_thread_id=#/*!*/; -SET @@session.foreign_key_checks=1, @@session.sql_auto_is_null=0, @@session.unique_checks=1, @@session.autocommit=1, @@session.check_constraint_checks=1, @@session.sql_if_exists=0, @@session.explicit_defaults_for_timestamp=0/*!*/; +SET @@session.foreign_key_checks=1, @@session.sql_auto_is_null=0, @@session.unique_checks=1, @@session.autocommit=1, @@session.check_constraint_checks=1, @@session.sql_if_exists=0, @@session.explicit_defaults_for_timestamp=1/*!*/; SET @@session.sql_mode=0/*!*/; SET @@session.auto_increment_increment=1, @@session.auto_increment_offset=1/*!*/; /*!\C latin1 *//*!*/; @@ -977,7 +977,7 @@ ROLLBACK/*!*/; #010909 4:46:40 server id # end_log_pos # Query thread_id=# exec_time=# error_code=0 xid=<xid> SET TIMESTAMP=1000000000/*!*/; SET @@session.pseudo_thread_id=#/*!*/; -SET @@session.foreign_key_checks=1, @@session.sql_auto_is_null=0, @@session.unique_checks=1, @@session.autocommit=1, @@session.check_constraint_checks=1, @@session.sql_if_exists=0, @@session.explicit_defaults_for_timestamp=0/*!*/; +SET @@session.foreign_key_checks=1, @@session.sql_auto_is_null=0, @@session.unique_checks=1, @@session.autocommit=1, @@session.check_constraint_checks=1, @@session.sql_if_exists=0, @@session.explicit_defaults_for_timestamp=1/*!*/; SET @@session.sql_mode=0/*!*/; SET @@session.auto_increment_increment=1, @@session.auto_increment_offset=1/*!*/; /*!\C latin1 *//*!*/; @@ -1136,7 +1136,7 @@ ROLLBACK/*!*/; #010909 4:46:40 server id # end_log_pos # Query thread_id=# exec_time=# error_code=0 xid=<xid> SET TIMESTAMP=1000000000/*!*/; SET @@session.pseudo_thread_id=#/*!*/; -SET @@session.foreign_key_checks=1, @@session.sql_auto_is_null=0, @@session.unique_checks=1, @@session.autocommit=1, @@session.check_constraint_checks=1, @@session.sql_if_exists=0, @@session.explicit_defaults_for_timestamp=0/*!*/; +SET @@session.foreign_key_checks=1, @@session.sql_auto_is_null=0, @@session.unique_checks=1, @@session.autocommit=1, @@session.check_constraint_checks=1, @@session.sql_if_exists=0, @@session.explicit_defaults_for_timestamp=1/*!*/; SET @@session.sql_mode=0/*!*/; SET @@session.auto_increment_increment=1, @@session.auto_increment_offset=1/*!*/; /*!\C latin1 *//*!*/; diff --git a/mysql-test/suite/binlog/r/binlog_row_ctype_ucs.result b/mysql-test/suite/binlog/r/binlog_row_ctype_ucs.result index 74aef814785..6d10d5420e4 100644 --- a/mysql-test/suite/binlog/r/binlog_row_ctype_ucs.result +++ b/mysql-test/suite/binlog/r/binlog_row_ctype_ucs.result @@ -22,7 +22,7 @@ START TRANSACTION #Q> insert into t2 values (@v) SET TIMESTAMP=10000/*!*/; SET @@session.pseudo_thread_id=999999999/*!*/; -SET @@session.foreign_key_checks=1, @@session.sql_auto_is_null=0, @@session.unique_checks=1, @@session.autocommit=1, @@session.check_constraint_checks=1, @@session.sql_if_exists=0, @@session.explicit_defaults_for_timestamp=0/*!*/; +SET @@session.foreign_key_checks=1, @@session.sql_auto_is_null=0, @@session.unique_checks=1, @@session.autocommit=1, @@session.check_constraint_checks=1, @@session.sql_if_exists=0, @@session.explicit_defaults_for_timestamp=1/*!*/; SET @@session.sql_mode=1411383296/*!*/; SET @@session.auto_increment_increment=1, @@session.auto_increment_offset=1/*!*/; /*!\C latin1 *//*!*/; @@ -92,7 +92,7 @@ DELIMITER /*!*/; use `test`/*!*/; SET TIMESTAMP=XXX/*!*/; SET @@session.pseudo_thread_id=#/*!*/; -SET @@session.foreign_key_checks=1, @@session.sql_auto_is_null=0, @@session.unique_checks=1, @@session.autocommit=1, @@session.check_constraint_checks=1, @@session.sql_if_exists=0, @@session.explicit_defaults_for_timestamp=0/*!*/; +SET @@session.foreign_key_checks=1, @@session.sql_auto_is_null=0, @@session.unique_checks=1, @@session.autocommit=1, @@session.check_constraint_checks=1, @@session.sql_if_exists=0, @@session.explicit_defaults_for_timestamp=1/*!*/; SET @@session.sql_mode=1411383296/*!*/; SET @@session.auto_increment_increment=1, @@session.auto_increment_offset=1/*!*/; /*!\C utf8mb3 *//*!*/; diff --git a/mysql-test/suite/binlog/r/binlog_row_mysqlbinlog_options.result b/mysql-test/suite/binlog/r/binlog_row_mysqlbinlog_options.result index dc7750b975e..fe08f6e9fe9 100644 --- a/mysql-test/suite/binlog/r/binlog_row_mysqlbinlog_options.result +++ b/mysql-test/suite/binlog/r/binlog_row_mysqlbinlog_options.result @@ -50,7 +50,7 @@ use `new_test1`/*!*/; #010909 4:46:40 server id # end_log_pos # CRC32 XXX Query thread_id=# exec_time=# error_code=0 xid=<xid> SET TIMESTAMP=1000000000/*!*/; SET @@session.pseudo_thread_id=#/*!*/; -SET @@session.foreign_key_checks=1, @@session.sql_auto_is_null=0, @@session.unique_checks=1, @@session.autocommit=1, @@session.check_constraint_checks=1, @@session.sql_if_exists=0, @@session.explicit_defaults_for_timestamp=0/*!*/; +SET @@session.foreign_key_checks=1, @@session.sql_auto_is_null=0, @@session.unique_checks=1, @@session.autocommit=1, @@session.check_constraint_checks=1, @@session.sql_if_exists=0, @@session.explicit_defaults_for_timestamp=1/*!*/; SET @@session.sql_mode=1411383296/*!*/; SET @@session.auto_increment_increment=1, @@session.auto_increment_offset=1/*!*/; /*!\C latin1 *//*!*/; @@ -291,7 +291,7 @@ use `new_test1`/*!*/; #010909 4:46:40 server id # end_log_pos # CRC32 XXX Query thread_id=# exec_time=# error_code=0 xid=<xid> SET TIMESTAMP=1000000000/*!*/; SET @@session.pseudo_thread_id=#/*!*/; -SET @@session.foreign_key_checks=1, @@session.sql_auto_is_null=0, @@session.unique_checks=1, @@session.autocommit=1, @@session.check_constraint_checks=1, @@session.sql_if_exists=0, @@session.explicit_defaults_for_timestamp=0/*!*/; +SET @@session.foreign_key_checks=1, @@session.sql_auto_is_null=0, @@session.unique_checks=1, @@session.autocommit=1, @@session.check_constraint_checks=1, @@session.sql_if_exists=0, @@session.explicit_defaults_for_timestamp=1/*!*/; SET @@session.sql_mode=1411383296/*!*/; SET @@session.auto_increment_increment=1, @@session.auto_increment_offset=1/*!*/; /*!\C latin1 *//*!*/; diff --git a/mysql-test/suite/binlog/r/binlog_stm_ctype_ucs.result b/mysql-test/suite/binlog/r/binlog_stm_ctype_ucs.result index e449025eee9..c78365a847e 100644 --- a/mysql-test/suite/binlog/r/binlog_stm_ctype_ucs.result +++ b/mysql-test/suite/binlog/r/binlog_stm_ctype_ucs.result @@ -21,7 +21,7 @@ SET @`v`:=_ucs2 X'006100620063' COLLATE `ucs2_general_ci`/*!*/; use `test`/*!*/; SET TIMESTAMP=10000/*!*/; SET @@session.pseudo_thread_id=999999999/*!*/; -SET @@session.foreign_key_checks=1, @@session.sql_auto_is_null=0, @@session.unique_checks=1, @@session.autocommit=1, @@session.check_constraint_checks=1, @@session.sql_if_exists=0, @@session.explicit_defaults_for_timestamp=0/*!*/; +SET @@session.foreign_key_checks=1, @@session.sql_auto_is_null=0, @@session.unique_checks=1, @@session.autocommit=1, @@session.check_constraint_checks=1, @@session.sql_if_exists=0, @@session.explicit_defaults_for_timestamp=1/*!*/; SET @@session.sql_mode=1411383296/*!*/; SET @@session.auto_increment_increment=1, @@session.auto_increment_offset=1/*!*/; /*!\C latin1 *//*!*/; @@ -94,7 +94,7 @@ DELIMITER /*!*/; use `test`/*!*/; SET TIMESTAMP=XXX/*!*/; SET @@session.pseudo_thread_id=#/*!*/; -SET @@session.foreign_key_checks=1, @@session.sql_auto_is_null=0, @@session.unique_checks=1, @@session.autocommit=1, @@session.check_constraint_checks=1, @@session.sql_if_exists=0, @@session.explicit_defaults_for_timestamp=0/*!*/; +SET @@session.foreign_key_checks=1, @@session.sql_auto_is_null=0, @@session.unique_checks=1, @@session.autocommit=1, @@session.check_constraint_checks=1, @@session.sql_if_exists=0, @@session.explicit_defaults_for_timestamp=1/*!*/; SET @@session.sql_mode=1411383296/*!*/; SET @@session.auto_increment_increment=1, @@session.auto_increment_offset=1/*!*/; /*!\C utf8mb3 *//*!*/; diff --git a/mysql-test/suite/binlog/r/binlog_table_map_optional_metadata.result b/mysql-test/suite/binlog/r/binlog_table_map_optional_metadata.result index e5f26e27531..b8b90ed65e4 100644 --- a/mysql-test/suite/binlog/r/binlog_table_map_optional_metadata.result +++ b/mysql-test/suite/binlog/r/binlog_table_map_optional_metadata.result @@ -5,7 +5,8 @@ SET GLOBAL binlog_row_metadata = MINIMAL; # CREATE TABLE t1(c_year YEAR, c_date DATE, c_time TIME, c_time_f TIME(3), c_datetime DATETIME, c_datetime_f DATETIME(3), -c_timestamp TIMESTAMP, c_timestamp_f TIMESTAMP(3) DEFAULT "2017-1-1 10:10:10"); +c_timestamp TIMESTAMP NOT NULL DEFAULT NOW(), +c_timestamp_f TIMESTAMP(3) DEFAULT "2017-1-1 10:10:10"); INSERT INTO t1(c_year) VALUES(2017); # Columns(YEAR, # DATE, @@ -14,7 +15,7 @@ INSERT INTO t1(c_year) VALUES(2017); # DATETIME, # DATETIME(3), # TIMESTAMP NOT NULL, -# TIMESTAMP(3) NOT NULL) +# TIMESTAMP(3)) DROP TABLE t1; RESET MASTER; # diff --git a/mysql-test/suite/binlog/r/flashback.result b/mysql-test/suite/binlog/r/flashback.result index 7d65a8ec2b3..da08f814783 100644 --- a/mysql-test/suite/binlog/r/flashback.result +++ b/mysql-test/suite/binlog/r/flashback.result @@ -60,7 +60,7 @@ ROLLBACK/*!*/; use `test`/*!*/; SET TIMESTAMP=1000000000/*!*/; SET @@session.pseudo_thread_id=#/*!*/; -SET @@session.foreign_key_checks=1, @@session.sql_auto_is_null=0, @@session.unique_checks=1, @@session.autocommit=1, @@session.check_constraint_checks=1, @@session.sql_if_exists=0, @@session.explicit_defaults_for_timestamp=0/*!*/; +SET @@session.foreign_key_checks=1, @@session.sql_auto_is_null=0, @@session.unique_checks=1, @@session.autocommit=1, @@session.check_constraint_checks=1, @@session.sql_if_exists=0, @@session.explicit_defaults_for_timestamp=1/*!*/; SET @@session.sql_mode=1411383296/*!*/; SET @@session.auto_increment_increment=1, @@session.auto_increment_offset=1/*!*/; /*!\C latin1 *//*!*/; @@ -422,7 +422,7 @@ COMMIT use `test`/*!*/; SET TIMESTAMP=1000000000/*!*/; SET @@session.pseudo_thread_id=#/*!*/; -SET @@session.foreign_key_checks=1, @@session.sql_auto_is_null=0, @@session.unique_checks=1, @@session.autocommit=1, @@session.check_constraint_checks=1, @@session.sql_if_exists=0, @@session.explicit_defaults_for_timestamp=0/*!*/; +SET @@session.foreign_key_checks=1, @@session.sql_auto_is_null=0, @@session.unique_checks=1, @@session.autocommit=1, @@session.check_constraint_checks=1, @@session.sql_if_exists=0, @@session.explicit_defaults_for_timestamp=1/*!*/; SET @@session.sql_mode=1411383296/*!*/; SET @@session.auto_increment_increment=1, @@session.auto_increment_offset=1/*!*/; /*!\C latin1 *//*!*/; diff --git a/mysql-test/suite/binlog/t/binlog_table_map_optional_metadata.test b/mysql-test/suite/binlog/t/binlog_table_map_optional_metadata.test index 9fd201e0cb9..4577c6c1de1 100644 --- a/mysql-test/suite/binlog/t/binlog_table_map_optional_metadata.test +++ b/mysql-test/suite/binlog/t/binlog_table_map_optional_metadata.test @@ -29,7 +29,8 @@ SET GLOBAL binlog_row_metadata = MINIMAL; --echo # CREATE TABLE t1(c_year YEAR, c_date DATE, c_time TIME, c_time_f TIME(3), c_datetime DATETIME, c_datetime_f DATETIME(3), - c_timestamp TIMESTAMP, c_timestamp_f TIMESTAMP(3) DEFAULT "2017-1-1 10:10:10"); + c_timestamp TIMESTAMP NOT NULL DEFAULT NOW(), + c_timestamp_f TIMESTAMP(3) DEFAULT "2017-1-1 10:10:10"); INSERT INTO t1(c_year) VALUES(2017); --source include/print_optional_metadata.inc diff --git a/mysql-test/suite/binlog_encryption/binlog_row_annotate.result b/mysql-test/suite/binlog_encryption/binlog_row_annotate.result index 80b9c5d476c..2614020b7a9 100644 --- a/mysql-test/suite/binlog_encryption/binlog_row_annotate.result +++ b/mysql-test/suite/binlog_encryption/binlog_row_annotate.result @@ -120,7 +120,7 @@ ROLLBACK/*!*/; #010909 4:46:40 server id # end_log_pos # Query thread_id=# exec_time=# error_code=0 xid=<xid> SET TIMESTAMP=1000000000/*!*/; SET @@session.pseudo_thread_id=#/*!*/; -SET @@session.foreign_key_checks=1, @@session.sql_auto_is_null=0, @@session.unique_checks=1, @@session.autocommit=1, @@session.check_constraint_checks=1, @@session.sql_if_exists=0, @@session.explicit_defaults_for_timestamp=0/*!*/; +SET @@session.foreign_key_checks=1, @@session.sql_auto_is_null=0, @@session.unique_checks=1, @@session.autocommit=1, @@session.check_constraint_checks=1, @@session.sql_if_exists=0, @@session.explicit_defaults_for_timestamp=1/*!*/; SET @@session.sql_mode=0/*!*/; SET @@session.auto_increment_increment=1, @@session.auto_increment_offset=1/*!*/; /*!\C latin1 *//*!*/; @@ -361,7 +361,7 @@ ROLLBACK/*!*/; #010909 4:46:40 server id # end_log_pos # Query thread_id=# exec_time=# error_code=0 xid=<xid> SET TIMESTAMP=1000000000/*!*/; SET @@session.pseudo_thread_id=#/*!*/; -SET @@session.foreign_key_checks=1, @@session.sql_auto_is_null=0, @@session.unique_checks=1, @@session.autocommit=1, @@session.check_constraint_checks=1, @@session.sql_if_exists=0, @@session.explicit_defaults_for_timestamp=0/*!*/; +SET @@session.foreign_key_checks=1, @@session.sql_auto_is_null=0, @@session.unique_checks=1, @@session.autocommit=1, @@session.check_constraint_checks=1, @@session.sql_if_exists=0, @@session.explicit_defaults_for_timestamp=1/*!*/; SET @@session.sql_mode=0/*!*/; SET @@session.auto_increment_increment=1, @@session.auto_increment_offset=1/*!*/; /*!\C latin1 *//*!*/; @@ -523,7 +523,7 @@ ROLLBACK/*!*/; #010909 4:46:40 server id # end_log_pos # Query thread_id=# exec_time=# error_code=0 xid=<xid> SET TIMESTAMP=1000000000/*!*/; SET @@session.pseudo_thread_id=#/*!*/; -SET @@session.foreign_key_checks=1, @@session.sql_auto_is_null=0, @@session.unique_checks=1, @@session.autocommit=1, @@session.check_constraint_checks=1, @@session.sql_if_exists=0, @@session.explicit_defaults_for_timestamp=0/*!*/; +SET @@session.foreign_key_checks=1, @@session.sql_auto_is_null=0, @@session.unique_checks=1, @@session.autocommit=1, @@session.check_constraint_checks=1, @@session.sql_if_exists=0, @@session.explicit_defaults_for_timestamp=1/*!*/; SET @@session.sql_mode=0/*!*/; SET @@session.auto_increment_increment=1, @@session.auto_increment_offset=1/*!*/; /*!\C latin1 *//*!*/; diff --git a/mysql-test/suite/compat/maxdb/rpl_mariadb_timestamp.result b/mysql-test/suite/compat/maxdb/rpl_mariadb_timestamp.result index 7c2012945c9..e6181b6f6fa 100644 --- a/mysql-test/suite/compat/maxdb/rpl_mariadb_timestamp.result +++ b/mysql-test/suite/compat/maxdb/rpl_mariadb_timestamp.result @@ -5,7 +5,7 @@ include/master-slave.inc # SET timestamp=UNIX_TIMESTAMP('2001-01-01 10:00:00'); SET sql_mode=DEFAULT; -CREATE TABLE t1 (a TIMESTAMP); +CREATE TABLE t1 (a TIMESTAMP NOT NULL DEFAULT NOW()); INSERT INTO t1 VALUES (NULL); INSERT INTO t1 VALUES ('2001-01-01 10:20:30'); SET sql_mode=MAXDB; @@ -14,7 +14,7 @@ SET timestamp=DEFAULT; include/show_binlog_events.inc Log_name Pos Event_type Server_id End_log_pos Info master-bin.000001 # Gtid # # GTID #-#-# -master-bin.000001 # Query # # use `test`; CREATE TABLE t1 (a TIMESTAMP) +master-bin.000001 # Query # # use `test`; CREATE TABLE t1 (a TIMESTAMP NOT NULL DEFAULT NOW()) master-bin.000001 # Gtid # # BEGIN GTID #-#-# master-bin.000001 # Annotate_rows # # INSERT INTO t1 VALUES (NULL) master-bin.000001 # Table_map # # table_id: # (test.t1) @@ -42,7 +42,7 @@ SET sql_mode=DEFAULT; SHOW CREATE TABLE t1; Table Create Table t1 CREATE TABLE `t1` ( - `a` timestamp NOT NULL DEFAULT current_timestamp() ON UPDATE current_timestamp() + `a` timestamp NOT NULL DEFAULT current_timestamp() ) ENGINE=MyISAM DEFAULT CHARSET=latin1 SHOW CREATE TABLE t2; Table Create Table diff --git a/mysql-test/suite/compat/maxdb/rpl_mariadb_timestamp.test b/mysql-test/suite/compat/maxdb/rpl_mariadb_timestamp.test index 50663229937..f4a826615eb 100644 --- a/mysql-test/suite/compat/maxdb/rpl_mariadb_timestamp.test +++ b/mysql-test/suite/compat/maxdb/rpl_mariadb_timestamp.test @@ -7,7 +7,7 @@ SET timestamp=UNIX_TIMESTAMP('2001-01-01 10:00:00'); SET sql_mode=DEFAULT; -CREATE TABLE t1 (a TIMESTAMP); +CREATE TABLE t1 (a TIMESTAMP NOT NULL DEFAULT NOW()); INSERT INTO t1 VALUES (NULL); INSERT INTO t1 VALUES ('2001-01-01 10:20:30'); SET sql_mode=MAXDB; @@ -17,7 +17,6 @@ SET timestamp=DEFAULT; --let $binlog_file = LAST source include/show_binlog_events.inc; - --sync_slave_with_master SELECT * FROM t1; SET sql_mode=DEFAULT; diff --git a/mysql-test/suite/compat/maxdb/type_timestamp.result b/mysql-test/suite/compat/maxdb/type_timestamp.result index 355a4e28414..b530c44ebf9 100644 --- a/mysql-test/suite/compat/maxdb/type_timestamp.result +++ b/mysql-test/suite/compat/maxdb/type_timestamp.result @@ -11,18 +11,18 @@ max_timestamp maxdb_schema.TIMESTAMP SHOW CREATE TABLE t1; Table Create Table t1 CREATE TABLE `t1` ( - `def_timestamp` timestamp NOT NULL DEFAULT current_timestamp() ON UPDATE current_timestamp(), - `mdb_timestamp` timestamp NOT NULL DEFAULT '0000-00-00 00:00:00', - `ora_timestamp` timestamp NOT NULL DEFAULT '0000-00-00 00:00:00', + `def_timestamp` timestamp NULL DEFAULT NULL, + `mdb_timestamp` timestamp NULL DEFAULT NULL, + `ora_timestamp` timestamp NULL DEFAULT NULL, `max_timestamp` datetime DEFAULT NULL ) ENGINE=MyISAM DEFAULT CHARSET=latin1 SET sql_mode=MAXDB; SHOW CREATE TABLE t1; Table Create Table t1 CREATE TABLE "t1" ( - "def_timestamp" mariadb_schema.timestamp NOT NULL DEFAULT current_timestamp(), - "mdb_timestamp" mariadb_schema.timestamp NOT NULL DEFAULT '0000-00-00 00:00:00', - "ora_timestamp" mariadb_schema.timestamp NOT NULL DEFAULT '0000-00-00 00:00:00', + "def_timestamp" mariadb_schema.timestamp NULL DEFAULT NULL, + "mdb_timestamp" mariadb_schema.timestamp NULL DEFAULT NULL, + "ora_timestamp" mariadb_schema.timestamp NULL DEFAULT NULL, "max_timestamp" datetime DEFAULT NULL ) DROP TABLE t1; @@ -37,8 +37,8 @@ SHOW CREATE TABLE t1; Table Create Table t1 CREATE TABLE "t1" ( "def_timestamp" datetime DEFAULT NULL, - "mdb_timestamp" mariadb_schema.timestamp NOT NULL DEFAULT current_timestamp(), - "ora_timestamp" mariadb_schema.timestamp NOT NULL DEFAULT '0000-00-00 00:00:00', + "mdb_timestamp" mariadb_schema.timestamp NULL DEFAULT NULL, + "ora_timestamp" mariadb_schema.timestamp NULL DEFAULT NULL, "max_timestamp" datetime DEFAULT NULL ) SET sql_mode=DEFAULT; @@ -46,8 +46,8 @@ SHOW CREATE TABLE t1; Table Create Table t1 CREATE TABLE `t1` ( `def_timestamp` datetime DEFAULT NULL, - `mdb_timestamp` timestamp NOT NULL DEFAULT current_timestamp() ON UPDATE current_timestamp(), - `ora_timestamp` timestamp NOT NULL DEFAULT '0000-00-00 00:00:00', + `mdb_timestamp` timestamp NULL DEFAULT NULL, + `ora_timestamp` timestamp NULL DEFAULT NULL, `max_timestamp` datetime DEFAULT NULL ) ENGINE=MyISAM DEFAULT CHARSET=latin1 DROP TABLE t1; diff --git a/mysql-test/suite/compat/oracle/r/sp.result b/mysql-test/suite/compat/oracle/r/sp.result index 047fada5acb..56360562309 100644 --- a/mysql-test/suite/compat/oracle/r/sp.result +++ b/mysql-test/suite/compat/oracle/r/sp.result @@ -1796,7 +1796,7 @@ def tm6 tm6 11 17 15 Y 128 6 63 def dt0 dt0 12 19 19 Y 128 0 63 def dt3 dt3 12 23 23 Y 128 3 63 def dt6 dt6 12 26 26 Y 128 6 63 -def ts0 ts0 7 19 19 Y 9376 0 63 +def ts0 ts0 7 19 19 Y 160 0 63 def ts3 ts3 7 23 23 Y 160 3 63 def ts6 ts6 7 26 26 Y 160 6 63 bit6 0 diff --git a/mysql-test/suite/engines/funcs/r/ix_index_non_string.result b/mysql-test/suite/engines/funcs/r/ix_index_non_string.result index 908327b1513..7a07a97c61a 100644 --- a/mysql-test/suite/engines/funcs/r/ix_index_non_string.result +++ b/mysql-test/suite/engines/funcs/r/ix_index_non_string.result @@ -427,7 +427,7 @@ t1 SHOW CREATE TABLE t1; Table Create Table t1 CREATE TABLE `t1` ( - `c1` timestamp NOT NULL DEFAULT current_timestamp() ON UPDATE current_timestamp(), + `c1` timestamp NOT NULL, KEY `i1` (`c1`) ) ENGINE=ENGINE DEFAULT CHARSET=latin1 DROP TABLE t1; diff --git a/mysql-test/suite/engines/funcs/r/ix_unique_non_string.result b/mysql-test/suite/engines/funcs/r/ix_unique_non_string.result index c9f1040c151..077829aa786 100644 --- a/mysql-test/suite/engines/funcs/r/ix_unique_non_string.result +++ b/mysql-test/suite/engines/funcs/r/ix_unique_non_string.result @@ -427,7 +427,7 @@ t1 SHOW CREATE TABLE t1; Table Create Table t1 CREATE TABLE `t1` ( - `c1` timestamp NOT NULL DEFAULT current_timestamp() ON UPDATE current_timestamp(), + `c1` timestamp NOT NULL, UNIQUE KEY `i1` (`c1`) ) ENGINE=ENGINE DEFAULT CHARSET=latin1 DROP TABLE t1; diff --git a/mysql-test/suite/engines/funcs/r/rpl_sp.result b/mysql-test/suite/engines/funcs/r/rpl_sp.result index 00b15c36baa..3108f45be0a 100644 --- a/mysql-test/suite/engines/funcs/r/rpl_sp.result +++ b/mysql-test/suite/engines/funcs/r/rpl_sp.result @@ -771,7 +771,7 @@ DELIMITER /*!*/; ROLLBACK/*!*/; SET TIMESTAMP=t/*!*/; SET @@session.pseudo_thread_id=999999999/*!*/; -SET @@session.foreign_key_checks=1, @@session.sql_auto_is_null=0, @@session.unique_checks=1, @@session.autocommit=1, @@session.check_constraint_checks=1, @@session.sql_if_exists=0, @@session.explicit_defaults_for_timestamp=0/*!*/; +SET @@session.foreign_key_checks=1, @@session.sql_auto_is_null=0, @@session.unique_checks=1, @@session.autocommit=1, @@session.check_constraint_checks=1, @@session.sql_if_exists=0, @@session.explicit_defaults_for_timestamp=1/*!*/; SET @@session.sql_mode=0/*!*/; SET @@session.auto_increment_increment=1, @@session.auto_increment_offset=1/*!*/; /*!\C latin1 *//*!*/; diff --git a/mysql-test/suite/engines/funcs/r/ta_2part_column_to_pk.result b/mysql-test/suite/engines/funcs/r/ta_2part_column_to_pk.result index 5513053491d..5c7d0b269c2 100644 --- a/mysql-test/suite/engines/funcs/r/ta_2part_column_to_pk.result +++ b/mysql-test/suite/engines/funcs/r/ta_2part_column_to_pk.result @@ -342,8 +342,8 @@ t1 SHOW CREATE TABLE t1; Table Create Table t1 CREATE TABLE `t1` ( - `c1` timestamp NOT NULL DEFAULT current_timestamp() ON UPDATE current_timestamp(), - `c2` timestamp NOT NULL DEFAULT '0000-00-00 00:00:00' + `c1` timestamp NOT NULL, + `c2` timestamp NOT NULL ) ENGINE=ENGINE DEFAULT CHARSET=latin1 ALTER TABLE t1 ADD PRIMARY KEY (c1,c2); SHOW TABLES; @@ -352,8 +352,8 @@ t1 SHOW CREATE TABLE t1; Table Create Table t1 CREATE TABLE `t1` ( - `c1` timestamp NOT NULL DEFAULT current_timestamp() ON UPDATE current_timestamp(), - `c2` timestamp NOT NULL DEFAULT '0000-00-00 00:00:00', + `c1` timestamp NOT NULL, + `c2` timestamp NOT NULL, PRIMARY KEY (`c1`,`c2`) ) ENGINE=ENGINE DEFAULT CHARSET=latin1 DROP TABLE t1; diff --git a/mysql-test/suite/engines/funcs/r/ta_2part_diff_to_pk.result b/mysql-test/suite/engines/funcs/r/ta_2part_diff_to_pk.result index 03651dcfde0..d47d848ccef 100644 --- a/mysql-test/suite/engines/funcs/r/ta_2part_diff_to_pk.result +++ b/mysql-test/suite/engines/funcs/r/ta_2part_diff_to_pk.result @@ -398,7 +398,7 @@ t1 SHOW CREATE TABLE t1; Table Create Table t1 CREATE TABLE `t1` ( - `c1` timestamp NOT NULL DEFAULT current_timestamp() ON UPDATE current_timestamp(), + `c1` timestamp NOT NULL, `c2` bit(1) NOT NULL, `c3` int(11) DEFAULT NULL, `c4` varchar(10) NOT NULL @@ -410,7 +410,7 @@ t1 SHOW CREATE TABLE t1; Table Create Table t1 CREATE TABLE `t1` ( - `c1` timestamp NOT NULL DEFAULT current_timestamp() ON UPDATE current_timestamp(), + `c1` timestamp NOT NULL, `c2` bit(1) NOT NULL, `c3` int(11) DEFAULT NULL, `c4` varchar(10) NOT NULL, @@ -846,7 +846,7 @@ t1 SHOW CREATE TABLE t1; Table Create Table t1 CREATE TABLE `t1` ( - `c1` timestamp NOT NULL DEFAULT current_timestamp() ON UPDATE current_timestamp(), + `c1` timestamp NOT NULL, `c2` tinyint(4) NOT NULL, `c3` int(11) DEFAULT NULL, `c4` varchar(10) NOT NULL @@ -858,7 +858,7 @@ t1 SHOW CREATE TABLE t1; Table Create Table t1 CREATE TABLE `t1` ( - `c1` timestamp NOT NULL DEFAULT current_timestamp() ON UPDATE current_timestamp(), + `c1` timestamp NOT NULL, `c2` tinyint(4) NOT NULL, `c3` int(11) DEFAULT NULL, `c4` varchar(10) NOT NULL, @@ -1294,7 +1294,7 @@ t1 SHOW CREATE TABLE t1; Table Create Table t1 CREATE TABLE `t1` ( - `c1` timestamp NOT NULL DEFAULT current_timestamp() ON UPDATE current_timestamp(), + `c1` timestamp NOT NULL, `c2` smallint(6) NOT NULL, `c3` int(11) DEFAULT NULL, `c4` varchar(10) NOT NULL @@ -1306,7 +1306,7 @@ t1 SHOW CREATE TABLE t1; Table Create Table t1 CREATE TABLE `t1` ( - `c1` timestamp NOT NULL DEFAULT current_timestamp() ON UPDATE current_timestamp(), + `c1` timestamp NOT NULL, `c2` smallint(6) NOT NULL, `c3` int(11) DEFAULT NULL, `c4` varchar(10) NOT NULL, @@ -1742,7 +1742,7 @@ t1 SHOW CREATE TABLE t1; Table Create Table t1 CREATE TABLE `t1` ( - `c1` timestamp NOT NULL DEFAULT current_timestamp() ON UPDATE current_timestamp(), + `c1` timestamp NOT NULL, `c2` mediumint(9) NOT NULL, `c3` int(11) DEFAULT NULL, `c4` varchar(10) NOT NULL @@ -1754,7 +1754,7 @@ t1 SHOW CREATE TABLE t1; Table Create Table t1 CREATE TABLE `t1` ( - `c1` timestamp NOT NULL DEFAULT current_timestamp() ON UPDATE current_timestamp(), + `c1` timestamp NOT NULL, `c2` mediumint(9) NOT NULL, `c3` int(11) DEFAULT NULL, `c4` varchar(10) NOT NULL, @@ -2190,7 +2190,7 @@ t1 SHOW CREATE TABLE t1; Table Create Table t1 CREATE TABLE `t1` ( - `c1` timestamp NOT NULL DEFAULT current_timestamp() ON UPDATE current_timestamp(), + `c1` timestamp NOT NULL, `c2` int(11) NOT NULL, `c3` int(11) DEFAULT NULL, `c4` varchar(10) NOT NULL @@ -2202,7 +2202,7 @@ t1 SHOW CREATE TABLE t1; Table Create Table t1 CREATE TABLE `t1` ( - `c1` timestamp NOT NULL DEFAULT current_timestamp() ON UPDATE current_timestamp(), + `c1` timestamp NOT NULL, `c2` int(11) NOT NULL, `c3` int(11) DEFAULT NULL, `c4` varchar(10) NOT NULL, @@ -2638,7 +2638,7 @@ t1 SHOW CREATE TABLE t1; Table Create Table t1 CREATE TABLE `t1` ( - `c1` timestamp NOT NULL DEFAULT current_timestamp() ON UPDATE current_timestamp(), + `c1` timestamp NOT NULL, `c2` int(11) NOT NULL, `c3` int(11) DEFAULT NULL, `c4` varchar(10) NOT NULL @@ -2650,7 +2650,7 @@ t1 SHOW CREATE TABLE t1; Table Create Table t1 CREATE TABLE `t1` ( - `c1` timestamp NOT NULL DEFAULT current_timestamp() ON UPDATE current_timestamp(), + `c1` timestamp NOT NULL, `c2` int(11) NOT NULL, `c3` int(11) DEFAULT NULL, `c4` varchar(10) NOT NULL, @@ -3086,7 +3086,7 @@ t1 SHOW CREATE TABLE t1; Table Create Table t1 CREATE TABLE `t1` ( - `c1` timestamp NOT NULL DEFAULT current_timestamp() ON UPDATE current_timestamp(), + `c1` timestamp NOT NULL, `c2` bigint(20) NOT NULL, `c3` int(11) DEFAULT NULL, `c4` varchar(10) NOT NULL @@ -3098,7 +3098,7 @@ t1 SHOW CREATE TABLE t1; Table Create Table t1 CREATE TABLE `t1` ( - `c1` timestamp NOT NULL DEFAULT current_timestamp() ON UPDATE current_timestamp(), + `c1` timestamp NOT NULL, `c2` bigint(20) NOT NULL, `c3` int(11) DEFAULT NULL, `c4` varchar(10) NOT NULL, @@ -3534,7 +3534,7 @@ t1 SHOW CREATE TABLE t1; Table Create Table t1 CREATE TABLE `t1` ( - `c1` timestamp NOT NULL DEFAULT current_timestamp() ON UPDATE current_timestamp(), + `c1` timestamp NOT NULL, `c2` double NOT NULL, `c3` int(11) DEFAULT NULL, `c4` varchar(10) NOT NULL @@ -3546,7 +3546,7 @@ t1 SHOW CREATE TABLE t1; Table Create Table t1 CREATE TABLE `t1` ( - `c1` timestamp NOT NULL DEFAULT current_timestamp() ON UPDATE current_timestamp(), + `c1` timestamp NOT NULL, `c2` double NOT NULL, `c3` int(11) DEFAULT NULL, `c4` varchar(10) NOT NULL, @@ -3982,7 +3982,7 @@ t1 SHOW CREATE TABLE t1; Table Create Table t1 CREATE TABLE `t1` ( - `c1` timestamp NOT NULL DEFAULT current_timestamp() ON UPDATE current_timestamp(), + `c1` timestamp NOT NULL, `c2` double NOT NULL, `c3` int(11) DEFAULT NULL, `c4` varchar(10) NOT NULL @@ -3994,7 +3994,7 @@ t1 SHOW CREATE TABLE t1; Table Create Table t1 CREATE TABLE `t1` ( - `c1` timestamp NOT NULL DEFAULT current_timestamp() ON UPDATE current_timestamp(), + `c1` timestamp NOT NULL, `c2` double NOT NULL, `c3` int(11) DEFAULT NULL, `c4` varchar(10) NOT NULL, @@ -4430,7 +4430,7 @@ t1 SHOW CREATE TABLE t1; Table Create Table t1 CREATE TABLE `t1` ( - `c1` timestamp NOT NULL DEFAULT current_timestamp() ON UPDATE current_timestamp(), + `c1` timestamp NOT NULL, `c2` float NOT NULL, `c3` int(11) DEFAULT NULL, `c4` varchar(10) NOT NULL @@ -4442,7 +4442,7 @@ t1 SHOW CREATE TABLE t1; Table Create Table t1 CREATE TABLE `t1` ( - `c1` timestamp NOT NULL DEFAULT current_timestamp() ON UPDATE current_timestamp(), + `c1` timestamp NOT NULL, `c2` float NOT NULL, `c3` int(11) DEFAULT NULL, `c4` varchar(10) NOT NULL, @@ -4878,7 +4878,7 @@ t1 SHOW CREATE TABLE t1; Table Create Table t1 CREATE TABLE `t1` ( - `c1` timestamp NOT NULL DEFAULT current_timestamp() ON UPDATE current_timestamp(), + `c1` timestamp NOT NULL, `c2` decimal(10,0) NOT NULL, `c3` int(11) DEFAULT NULL, `c4` varchar(10) NOT NULL @@ -4890,7 +4890,7 @@ t1 SHOW CREATE TABLE t1; Table Create Table t1 CREATE TABLE `t1` ( - `c1` timestamp NOT NULL DEFAULT current_timestamp() ON UPDATE current_timestamp(), + `c1` timestamp NOT NULL, `c2` decimal(10,0) NOT NULL, `c3` int(11) DEFAULT NULL, `c4` varchar(10) NOT NULL, @@ -5326,7 +5326,7 @@ t1 SHOW CREATE TABLE t1; Table Create Table t1 CREATE TABLE `t1` ( - `c1` timestamp NOT NULL DEFAULT current_timestamp() ON UPDATE current_timestamp(), + `c1` timestamp NOT NULL, `c2` decimal(10,0) NOT NULL, `c3` int(11) DEFAULT NULL, `c4` varchar(10) NOT NULL @@ -5338,7 +5338,7 @@ t1 SHOW CREATE TABLE t1; Table Create Table t1 CREATE TABLE `t1` ( - `c1` timestamp NOT NULL DEFAULT current_timestamp() ON UPDATE current_timestamp(), + `c1` timestamp NOT NULL, `c2` decimal(10,0) NOT NULL, `c3` int(11) DEFAULT NULL, `c4` varchar(10) NOT NULL, @@ -5774,7 +5774,7 @@ t1 SHOW CREATE TABLE t1; Table Create Table t1 CREATE TABLE `t1` ( - `c1` timestamp NOT NULL DEFAULT current_timestamp() ON UPDATE current_timestamp(), + `c1` timestamp NOT NULL, `c2` date NOT NULL, `c3` int(11) DEFAULT NULL, `c4` varchar(10) NOT NULL @@ -5786,7 +5786,7 @@ t1 SHOW CREATE TABLE t1; Table Create Table t1 CREATE TABLE `t1` ( - `c1` timestamp NOT NULL DEFAULT current_timestamp() ON UPDATE current_timestamp(), + `c1` timestamp NOT NULL, `c2` date NOT NULL, `c3` int(11) DEFAULT NULL, `c4` varchar(10) NOT NULL, @@ -6222,7 +6222,7 @@ t1 SHOW CREATE TABLE t1; Table Create Table t1 CREATE TABLE `t1` ( - `c1` timestamp NOT NULL DEFAULT current_timestamp() ON UPDATE current_timestamp(), + `c1` timestamp NOT NULL, `c2` time NOT NULL, `c3` int(11) DEFAULT NULL, `c4` varchar(10) NOT NULL @@ -6234,7 +6234,7 @@ t1 SHOW CREATE TABLE t1; Table Create Table t1 CREATE TABLE `t1` ( - `c1` timestamp NOT NULL DEFAULT current_timestamp() ON UPDATE current_timestamp(), + `c1` timestamp NOT NULL, `c2` time NOT NULL, `c3` int(11) DEFAULT NULL, `c4` varchar(10) NOT NULL, @@ -6279,7 +6279,7 @@ SHOW CREATE TABLE t1; Table Create Table t1 CREATE TABLE `t1` ( `c1` bit(1) NOT NULL, - `c2` timestamp NOT NULL DEFAULT current_timestamp() ON UPDATE current_timestamp(), + `c2` timestamp NOT NULL, `c3` int(11) DEFAULT NULL, `c4` varchar(10) NOT NULL ) ENGINE=ENGINE DEFAULT CHARSET=latin1 @@ -6291,7 +6291,7 @@ SHOW CREATE TABLE t1; Table Create Table t1 CREATE TABLE `t1` ( `c1` bit(1) NOT NULL, - `c2` timestamp NOT NULL DEFAULT current_timestamp() ON UPDATE current_timestamp(), + `c2` timestamp NOT NULL, `c3` int(11) DEFAULT NULL, `c4` varchar(10) NOT NULL, PRIMARY KEY (`c1`,`c2`) @@ -6307,7 +6307,7 @@ SHOW CREATE TABLE t1; Table Create Table t1 CREATE TABLE `t1` ( `c1` tinyint(4) NOT NULL, - `c2` timestamp NOT NULL DEFAULT current_timestamp() ON UPDATE current_timestamp(), + `c2` timestamp NOT NULL, `c3` int(11) DEFAULT NULL, `c4` varchar(10) NOT NULL ) ENGINE=ENGINE DEFAULT CHARSET=latin1 @@ -6319,7 +6319,7 @@ SHOW CREATE TABLE t1; Table Create Table t1 CREATE TABLE `t1` ( `c1` tinyint(4) NOT NULL, - `c2` timestamp NOT NULL DEFAULT current_timestamp() ON UPDATE current_timestamp(), + `c2` timestamp NOT NULL, `c3` int(11) DEFAULT NULL, `c4` varchar(10) NOT NULL, PRIMARY KEY (`c1`,`c2`) @@ -6335,7 +6335,7 @@ SHOW CREATE TABLE t1; Table Create Table t1 CREATE TABLE `t1` ( `c1` smallint(6) NOT NULL, - `c2` timestamp NOT NULL DEFAULT current_timestamp() ON UPDATE current_timestamp(), + `c2` timestamp NOT NULL, `c3` int(11) DEFAULT NULL, `c4` varchar(10) NOT NULL ) ENGINE=ENGINE DEFAULT CHARSET=latin1 @@ -6347,7 +6347,7 @@ SHOW CREATE TABLE t1; Table Create Table t1 CREATE TABLE `t1` ( `c1` smallint(6) NOT NULL, - `c2` timestamp NOT NULL DEFAULT current_timestamp() ON UPDATE current_timestamp(), + `c2` timestamp NOT NULL, `c3` int(11) DEFAULT NULL, `c4` varchar(10) NOT NULL, PRIMARY KEY (`c1`,`c2`) @@ -6363,7 +6363,7 @@ SHOW CREATE TABLE t1; Table Create Table t1 CREATE TABLE `t1` ( `c1` mediumint(9) NOT NULL, - `c2` timestamp NOT NULL DEFAULT current_timestamp() ON UPDATE current_timestamp(), + `c2` timestamp NOT NULL, `c3` int(11) DEFAULT NULL, `c4` varchar(10) NOT NULL ) ENGINE=ENGINE DEFAULT CHARSET=latin1 @@ -6375,7 +6375,7 @@ SHOW CREATE TABLE t1; Table Create Table t1 CREATE TABLE `t1` ( `c1` mediumint(9) NOT NULL, - `c2` timestamp NOT NULL DEFAULT current_timestamp() ON UPDATE current_timestamp(), + `c2` timestamp NOT NULL, `c3` int(11) DEFAULT NULL, `c4` varchar(10) NOT NULL, PRIMARY KEY (`c1`,`c2`) @@ -6391,7 +6391,7 @@ SHOW CREATE TABLE t1; Table Create Table t1 CREATE TABLE `t1` ( `c1` int(11) NOT NULL, - `c2` timestamp NOT NULL DEFAULT current_timestamp() ON UPDATE current_timestamp(), + `c2` timestamp NOT NULL, `c3` int(11) DEFAULT NULL, `c4` varchar(10) NOT NULL ) ENGINE=ENGINE DEFAULT CHARSET=latin1 @@ -6403,7 +6403,7 @@ SHOW CREATE TABLE t1; Table Create Table t1 CREATE TABLE `t1` ( `c1` int(11) NOT NULL, - `c2` timestamp NOT NULL DEFAULT current_timestamp() ON UPDATE current_timestamp(), + `c2` timestamp NOT NULL, `c3` int(11) DEFAULT NULL, `c4` varchar(10) NOT NULL, PRIMARY KEY (`c1`,`c2`) @@ -6419,7 +6419,7 @@ SHOW CREATE TABLE t1; Table Create Table t1 CREATE TABLE `t1` ( `c1` int(11) NOT NULL, - `c2` timestamp NOT NULL DEFAULT current_timestamp() ON UPDATE current_timestamp(), + `c2` timestamp NOT NULL, `c3` int(11) DEFAULT NULL, `c4` varchar(10) NOT NULL ) ENGINE=ENGINE DEFAULT CHARSET=latin1 @@ -6431,7 +6431,7 @@ SHOW CREATE TABLE t1; Table Create Table t1 CREATE TABLE `t1` ( `c1` int(11) NOT NULL, - `c2` timestamp NOT NULL DEFAULT current_timestamp() ON UPDATE current_timestamp(), + `c2` timestamp NOT NULL, `c3` int(11) DEFAULT NULL, `c4` varchar(10) NOT NULL, PRIMARY KEY (`c1`,`c2`) @@ -6447,7 +6447,7 @@ SHOW CREATE TABLE t1; Table Create Table t1 CREATE TABLE `t1` ( `c1` bigint(20) NOT NULL, - `c2` timestamp NOT NULL DEFAULT current_timestamp() ON UPDATE current_timestamp(), + `c2` timestamp NOT NULL, `c3` int(11) DEFAULT NULL, `c4` varchar(10) NOT NULL ) ENGINE=ENGINE DEFAULT CHARSET=latin1 @@ -6459,7 +6459,7 @@ SHOW CREATE TABLE t1; Table Create Table t1 CREATE TABLE `t1` ( `c1` bigint(20) NOT NULL, - `c2` timestamp NOT NULL DEFAULT current_timestamp() ON UPDATE current_timestamp(), + `c2` timestamp NOT NULL, `c3` int(11) DEFAULT NULL, `c4` varchar(10) NOT NULL, PRIMARY KEY (`c1`,`c2`) @@ -6475,7 +6475,7 @@ SHOW CREATE TABLE t1; Table Create Table t1 CREATE TABLE `t1` ( `c1` double NOT NULL, - `c2` timestamp NOT NULL DEFAULT current_timestamp() ON UPDATE current_timestamp(), + `c2` timestamp NOT NULL, `c3` int(11) DEFAULT NULL, `c4` varchar(10) NOT NULL ) ENGINE=ENGINE DEFAULT CHARSET=latin1 @@ -6487,7 +6487,7 @@ SHOW CREATE TABLE t1; Table Create Table t1 CREATE TABLE `t1` ( `c1` double NOT NULL, - `c2` timestamp NOT NULL DEFAULT current_timestamp() ON UPDATE current_timestamp(), + `c2` timestamp NOT NULL, `c3` int(11) DEFAULT NULL, `c4` varchar(10) NOT NULL, PRIMARY KEY (`c1`,`c2`) @@ -6503,7 +6503,7 @@ SHOW CREATE TABLE t1; Table Create Table t1 CREATE TABLE `t1` ( `c1` double NOT NULL, - `c2` timestamp NOT NULL DEFAULT current_timestamp() ON UPDATE current_timestamp(), + `c2` timestamp NOT NULL, `c3` int(11) DEFAULT NULL, `c4` varchar(10) NOT NULL ) ENGINE=ENGINE DEFAULT CHARSET=latin1 @@ -6515,7 +6515,7 @@ SHOW CREATE TABLE t1; Table Create Table t1 CREATE TABLE `t1` ( `c1` double NOT NULL, - `c2` timestamp NOT NULL DEFAULT current_timestamp() ON UPDATE current_timestamp(), + `c2` timestamp NOT NULL, `c3` int(11) DEFAULT NULL, `c4` varchar(10) NOT NULL, PRIMARY KEY (`c1`,`c2`) @@ -6531,7 +6531,7 @@ SHOW CREATE TABLE t1; Table Create Table t1 CREATE TABLE `t1` ( `c1` float NOT NULL, - `c2` timestamp NOT NULL DEFAULT current_timestamp() ON UPDATE current_timestamp(), + `c2` timestamp NOT NULL, `c3` int(11) DEFAULT NULL, `c4` varchar(10) NOT NULL ) ENGINE=ENGINE DEFAULT CHARSET=latin1 @@ -6543,7 +6543,7 @@ SHOW CREATE TABLE t1; Table Create Table t1 CREATE TABLE `t1` ( `c1` float NOT NULL, - `c2` timestamp NOT NULL DEFAULT current_timestamp() ON UPDATE current_timestamp(), + `c2` timestamp NOT NULL, `c3` int(11) DEFAULT NULL, `c4` varchar(10) NOT NULL, PRIMARY KEY (`c1`,`c2`) @@ -6559,7 +6559,7 @@ SHOW CREATE TABLE t1; Table Create Table t1 CREATE TABLE `t1` ( `c1` decimal(10,0) NOT NULL, - `c2` timestamp NOT NULL DEFAULT current_timestamp() ON UPDATE current_timestamp(), + `c2` timestamp NOT NULL, `c3` int(11) DEFAULT NULL, `c4` varchar(10) NOT NULL ) ENGINE=ENGINE DEFAULT CHARSET=latin1 @@ -6571,7 +6571,7 @@ SHOW CREATE TABLE t1; Table Create Table t1 CREATE TABLE `t1` ( `c1` decimal(10,0) NOT NULL, - `c2` timestamp NOT NULL DEFAULT current_timestamp() ON UPDATE current_timestamp(), + `c2` timestamp NOT NULL, `c3` int(11) DEFAULT NULL, `c4` varchar(10) NOT NULL, PRIMARY KEY (`c1`,`c2`) @@ -6587,7 +6587,7 @@ SHOW CREATE TABLE t1; Table Create Table t1 CREATE TABLE `t1` ( `c1` decimal(10,0) NOT NULL, - `c2` timestamp NOT NULL DEFAULT current_timestamp() ON UPDATE current_timestamp(), + `c2` timestamp NOT NULL, `c3` int(11) DEFAULT NULL, `c4` varchar(10) NOT NULL ) ENGINE=ENGINE DEFAULT CHARSET=latin1 @@ -6599,7 +6599,7 @@ SHOW CREATE TABLE t1; Table Create Table t1 CREATE TABLE `t1` ( `c1` decimal(10,0) NOT NULL, - `c2` timestamp NOT NULL DEFAULT current_timestamp() ON UPDATE current_timestamp(), + `c2` timestamp NOT NULL, `c3` int(11) DEFAULT NULL, `c4` varchar(10) NOT NULL, PRIMARY KEY (`c1`,`c2`) @@ -6615,7 +6615,7 @@ SHOW CREATE TABLE t1; Table Create Table t1 CREATE TABLE `t1` ( `c1` date NOT NULL, - `c2` timestamp NOT NULL DEFAULT current_timestamp() ON UPDATE current_timestamp(), + `c2` timestamp NOT NULL, `c3` int(11) DEFAULT NULL, `c4` varchar(10) NOT NULL ) ENGINE=ENGINE DEFAULT CHARSET=latin1 @@ -6627,7 +6627,7 @@ SHOW CREATE TABLE t1; Table Create Table t1 CREATE TABLE `t1` ( `c1` date NOT NULL, - `c2` timestamp NOT NULL DEFAULT current_timestamp() ON UPDATE current_timestamp(), + `c2` timestamp NOT NULL, `c3` int(11) DEFAULT NULL, `c4` varchar(10) NOT NULL, PRIMARY KEY (`c1`,`c2`) @@ -6643,7 +6643,7 @@ SHOW CREATE TABLE t1; Table Create Table t1 CREATE TABLE `t1` ( `c1` time NOT NULL, - `c2` timestamp NOT NULL DEFAULT current_timestamp() ON UPDATE current_timestamp(), + `c2` timestamp NOT NULL, `c3` int(11) DEFAULT NULL, `c4` varchar(10) NOT NULL ) ENGINE=ENGINE DEFAULT CHARSET=latin1 @@ -6655,7 +6655,7 @@ SHOW CREATE TABLE t1; Table Create Table t1 CREATE TABLE `t1` ( `c1` time NOT NULL, - `c2` timestamp NOT NULL DEFAULT current_timestamp() ON UPDATE current_timestamp(), + `c2` timestamp NOT NULL, `c3` int(11) DEFAULT NULL, `c4` varchar(10) NOT NULL, PRIMARY KEY (`c1`,`c2`) @@ -6670,8 +6670,8 @@ t1 SHOW CREATE TABLE t1; Table Create Table t1 CREATE TABLE `t1` ( - `c1` timestamp NOT NULL DEFAULT current_timestamp() ON UPDATE current_timestamp(), - `c2` timestamp NOT NULL DEFAULT '0000-00-00 00:00:00', + `c1` timestamp NOT NULL, + `c2` timestamp NOT NULL, `c3` int(11) DEFAULT NULL, `c4` varchar(10) NOT NULL ) ENGINE=ENGINE DEFAULT CHARSET=latin1 @@ -6682,8 +6682,8 @@ t1 SHOW CREATE TABLE t1; Table Create Table t1 CREATE TABLE `t1` ( - `c1` timestamp NOT NULL DEFAULT current_timestamp() ON UPDATE current_timestamp(), - `c2` timestamp NOT NULL DEFAULT '0000-00-00 00:00:00', + `c1` timestamp NOT NULL, + `c2` timestamp NOT NULL, `c3` int(11) DEFAULT NULL, `c4` varchar(10) NOT NULL, PRIMARY KEY (`c1`,`c2`) @@ -6699,7 +6699,7 @@ SHOW CREATE TABLE t1; Table Create Table t1 CREATE TABLE `t1` ( `c1` year(4) NOT NULL, - `c2` timestamp NOT NULL DEFAULT current_timestamp() ON UPDATE current_timestamp(), + `c2` timestamp NOT NULL, `c3` int(11) DEFAULT NULL, `c4` varchar(10) NOT NULL ) ENGINE=ENGINE DEFAULT CHARSET=latin1 @@ -6711,7 +6711,7 @@ SHOW CREATE TABLE t1; Table Create Table t1 CREATE TABLE `t1` ( `c1` year(4) NOT NULL, - `c2` timestamp NOT NULL DEFAULT current_timestamp() ON UPDATE current_timestamp(), + `c2` timestamp NOT NULL, `c3` int(11) DEFAULT NULL, `c4` varchar(10) NOT NULL, PRIMARY KEY (`c1`,`c2`) @@ -7118,7 +7118,7 @@ t1 SHOW CREATE TABLE t1; Table Create Table t1 CREATE TABLE `t1` ( - `c1` timestamp NOT NULL DEFAULT current_timestamp() ON UPDATE current_timestamp(), + `c1` timestamp NOT NULL, `c2` year(4) NOT NULL, `c3` int(11) DEFAULT NULL, `c4` varchar(10) NOT NULL @@ -7130,7 +7130,7 @@ t1 SHOW CREATE TABLE t1; Table Create Table t1 CREATE TABLE `t1` ( - `c1` timestamp NOT NULL DEFAULT current_timestamp() ON UPDATE current_timestamp(), + `c1` timestamp NOT NULL, `c2` year(4) NOT NULL, `c3` int(11) DEFAULT NULL, `c4` varchar(10) NOT NULL, diff --git a/mysql-test/suite/engines/funcs/r/ta_3part_column_to_pk.result b/mysql-test/suite/engines/funcs/r/ta_3part_column_to_pk.result index ee57ab00455..aa987b2b28f 100644 --- a/mysql-test/suite/engines/funcs/r/ta_3part_column_to_pk.result +++ b/mysql-test/suite/engines/funcs/r/ta_3part_column_to_pk.result @@ -370,9 +370,9 @@ t1 SHOW CREATE TABLE t1; Table Create Table t1 CREATE TABLE `t1` ( - `c1` timestamp NOT NULL DEFAULT current_timestamp() ON UPDATE current_timestamp(), - `c2` timestamp NOT NULL DEFAULT '0000-00-00 00:00:00', - `c3` timestamp NOT NULL DEFAULT '0000-00-00 00:00:00' + `c1` timestamp NOT NULL, + `c2` timestamp NOT NULL, + `c3` timestamp NOT NULL ) ENGINE=ENGINE DEFAULT CHARSET=latin1 ALTER TABLE t1 ADD PRIMARY KEY (c1,c2,c3); SHOW TABLES; @@ -381,9 +381,9 @@ t1 SHOW CREATE TABLE t1; Table Create Table t1 CREATE TABLE `t1` ( - `c1` timestamp NOT NULL DEFAULT current_timestamp() ON UPDATE current_timestamp(), - `c2` timestamp NOT NULL DEFAULT '0000-00-00 00:00:00', - `c3` timestamp NOT NULL DEFAULT '0000-00-00 00:00:00', + `c1` timestamp NOT NULL, + `c2` timestamp NOT NULL, + `c3` timestamp NOT NULL, PRIMARY KEY (`c1`,`c2`,`c3`) ) ENGINE=ENGINE DEFAULT CHARSET=latin1 DROP TABLE t1; diff --git a/mysql-test/suite/engines/funcs/r/ta_add_column.result b/mysql-test/suite/engines/funcs/r/ta_add_column.result index 0600180ee0c..7816ef45caa 100644 --- a/mysql-test/suite/engines/funcs/r/ta_add_column.result +++ b/mysql-test/suite/engines/funcs/r/ta_add_column.result @@ -842,7 +842,7 @@ t1 SHOW CREATE TABLE t1; Table Create Table t1 CREATE TABLE `t1` ( - `c1` timestamp NOT NULL DEFAULT current_timestamp() ON UPDATE current_timestamp() + `c1` timestamp NOT NULL ) ENGINE=ENGINE DEFAULT CHARSET=latin1 ALTER TABLE t1 ADD c2 BIT NOT NULL; SHOW TABLES; @@ -851,7 +851,7 @@ t1 SHOW CREATE TABLE t1; Table Create Table t1 CREATE TABLE `t1` ( - `c1` timestamp NOT NULL DEFAULT current_timestamp() ON UPDATE current_timestamp(), + `c1` timestamp NOT NULL, `c2` bit(1) NOT NULL ) ENGINE=ENGINE DEFAULT CHARSET=latin1 DROP TABLE t1; @@ -1898,7 +1898,7 @@ t1 SHOW CREATE TABLE t1; Table Create Table t1 CREATE TABLE `t1` ( - `c1` timestamp NOT NULL DEFAULT current_timestamp() ON UPDATE current_timestamp() + `c1` timestamp NOT NULL ) ENGINE=ENGINE DEFAULT CHARSET=latin1 ALTER TABLE t1 ADD c2 TINYINT NOT NULL; SHOW TABLES; @@ -1907,7 +1907,7 @@ t1 SHOW CREATE TABLE t1; Table Create Table t1 CREATE TABLE `t1` ( - `c1` timestamp NOT NULL DEFAULT current_timestamp() ON UPDATE current_timestamp(), + `c1` timestamp NOT NULL, `c2` tinyint(4) NOT NULL ) ENGINE=ENGINE DEFAULT CHARSET=latin1 DROP TABLE t1; @@ -2954,7 +2954,7 @@ t1 SHOW CREATE TABLE t1; Table Create Table t1 CREATE TABLE `t1` ( - `c1` timestamp NOT NULL DEFAULT current_timestamp() ON UPDATE current_timestamp() + `c1` timestamp NOT NULL ) ENGINE=ENGINE DEFAULT CHARSET=latin1 ALTER TABLE t1 ADD c2 SMALLINT NOT NULL; SHOW TABLES; @@ -2963,7 +2963,7 @@ t1 SHOW CREATE TABLE t1; Table Create Table t1 CREATE TABLE `t1` ( - `c1` timestamp NOT NULL DEFAULT current_timestamp() ON UPDATE current_timestamp(), + `c1` timestamp NOT NULL, `c2` smallint(6) NOT NULL ) ENGINE=ENGINE DEFAULT CHARSET=latin1 DROP TABLE t1; @@ -4010,7 +4010,7 @@ t1 SHOW CREATE TABLE t1; Table Create Table t1 CREATE TABLE `t1` ( - `c1` timestamp NOT NULL DEFAULT current_timestamp() ON UPDATE current_timestamp() + `c1` timestamp NOT NULL ) ENGINE=ENGINE DEFAULT CHARSET=latin1 ALTER TABLE t1 ADD c2 MEDIUMINT NOT NULL; SHOW TABLES; @@ -4019,7 +4019,7 @@ t1 SHOW CREATE TABLE t1; Table Create Table t1 CREATE TABLE `t1` ( - `c1` timestamp NOT NULL DEFAULT current_timestamp() ON UPDATE current_timestamp(), + `c1` timestamp NOT NULL, `c2` mediumint(9) NOT NULL ) ENGINE=ENGINE DEFAULT CHARSET=latin1 DROP TABLE t1; @@ -5066,7 +5066,7 @@ t1 SHOW CREATE TABLE t1; Table Create Table t1 CREATE TABLE `t1` ( - `c1` timestamp NOT NULL DEFAULT current_timestamp() ON UPDATE current_timestamp() + `c1` timestamp NOT NULL ) ENGINE=ENGINE DEFAULT CHARSET=latin1 ALTER TABLE t1 ADD c2 INT NOT NULL; SHOW TABLES; @@ -5075,7 +5075,7 @@ t1 SHOW CREATE TABLE t1; Table Create Table t1 CREATE TABLE `t1` ( - `c1` timestamp NOT NULL DEFAULT current_timestamp() ON UPDATE current_timestamp(), + `c1` timestamp NOT NULL, `c2` int(11) NOT NULL ) ENGINE=ENGINE DEFAULT CHARSET=latin1 DROP TABLE t1; @@ -6122,7 +6122,7 @@ t1 SHOW CREATE TABLE t1; Table Create Table t1 CREATE TABLE `t1` ( - `c1` timestamp NOT NULL DEFAULT current_timestamp() ON UPDATE current_timestamp() + `c1` timestamp NOT NULL ) ENGINE=ENGINE DEFAULT CHARSET=latin1 ALTER TABLE t1 ADD c2 INTEGER NOT NULL; SHOW TABLES; @@ -6131,7 +6131,7 @@ t1 SHOW CREATE TABLE t1; Table Create Table t1 CREATE TABLE `t1` ( - `c1` timestamp NOT NULL DEFAULT current_timestamp() ON UPDATE current_timestamp(), + `c1` timestamp NOT NULL, `c2` int(11) NOT NULL ) ENGINE=ENGINE DEFAULT CHARSET=latin1 DROP TABLE t1; @@ -7178,7 +7178,7 @@ t1 SHOW CREATE TABLE t1; Table Create Table t1 CREATE TABLE `t1` ( - `c1` timestamp NOT NULL DEFAULT current_timestamp() ON UPDATE current_timestamp() + `c1` timestamp NOT NULL ) ENGINE=ENGINE DEFAULT CHARSET=latin1 ALTER TABLE t1 ADD c2 BIGINT NOT NULL; SHOW TABLES; @@ -7187,7 +7187,7 @@ t1 SHOW CREATE TABLE t1; Table Create Table t1 CREATE TABLE `t1` ( - `c1` timestamp NOT NULL DEFAULT current_timestamp() ON UPDATE current_timestamp(), + `c1` timestamp NOT NULL, `c2` bigint(20) NOT NULL ) ENGINE=ENGINE DEFAULT CHARSET=latin1 DROP TABLE t1; @@ -8234,7 +8234,7 @@ t1 SHOW CREATE TABLE t1; Table Create Table t1 CREATE TABLE `t1` ( - `c1` timestamp NOT NULL DEFAULT current_timestamp() ON UPDATE current_timestamp() + `c1` timestamp NOT NULL ) ENGINE=ENGINE DEFAULT CHARSET=latin1 ALTER TABLE t1 ADD c2 REAL NOT NULL; SHOW TABLES; @@ -8243,7 +8243,7 @@ t1 SHOW CREATE TABLE t1; Table Create Table t1 CREATE TABLE `t1` ( - `c1` timestamp NOT NULL DEFAULT current_timestamp() ON UPDATE current_timestamp(), + `c1` timestamp NOT NULL, `c2` double NOT NULL ) ENGINE=ENGINE DEFAULT CHARSET=latin1 DROP TABLE t1; @@ -9290,7 +9290,7 @@ t1 SHOW CREATE TABLE t1; Table Create Table t1 CREATE TABLE `t1` ( - `c1` timestamp NOT NULL DEFAULT current_timestamp() ON UPDATE current_timestamp() + `c1` timestamp NOT NULL ) ENGINE=ENGINE DEFAULT CHARSET=latin1 ALTER TABLE t1 ADD c2 DOUBLE NOT NULL; SHOW TABLES; @@ -9299,7 +9299,7 @@ t1 SHOW CREATE TABLE t1; Table Create Table t1 CREATE TABLE `t1` ( - `c1` timestamp NOT NULL DEFAULT current_timestamp() ON UPDATE current_timestamp(), + `c1` timestamp NOT NULL, `c2` double NOT NULL ) ENGINE=ENGINE DEFAULT CHARSET=latin1 DROP TABLE t1; @@ -10346,7 +10346,7 @@ t1 SHOW CREATE TABLE t1; Table Create Table t1 CREATE TABLE `t1` ( - `c1` timestamp NOT NULL DEFAULT current_timestamp() ON UPDATE current_timestamp() + `c1` timestamp NOT NULL ) ENGINE=ENGINE DEFAULT CHARSET=latin1 ALTER TABLE t1 ADD c2 FLOAT NOT NULL; SHOW TABLES; @@ -10355,7 +10355,7 @@ t1 SHOW CREATE TABLE t1; Table Create Table t1 CREATE TABLE `t1` ( - `c1` timestamp NOT NULL DEFAULT current_timestamp() ON UPDATE current_timestamp(), + `c1` timestamp NOT NULL, `c2` float NOT NULL ) ENGINE=ENGINE DEFAULT CHARSET=latin1 DROP TABLE t1; @@ -11402,7 +11402,7 @@ t1 SHOW CREATE TABLE t1; Table Create Table t1 CREATE TABLE `t1` ( - `c1` timestamp NOT NULL DEFAULT current_timestamp() ON UPDATE current_timestamp() + `c1` timestamp NOT NULL ) ENGINE=ENGINE DEFAULT CHARSET=latin1 ALTER TABLE t1 ADD c2 DECIMAL NOT NULL; SHOW TABLES; @@ -11411,7 +11411,7 @@ t1 SHOW CREATE TABLE t1; Table Create Table t1 CREATE TABLE `t1` ( - `c1` timestamp NOT NULL DEFAULT current_timestamp() ON UPDATE current_timestamp(), + `c1` timestamp NOT NULL, `c2` decimal(10,0) NOT NULL ) ENGINE=ENGINE DEFAULT CHARSET=latin1 DROP TABLE t1; @@ -12458,7 +12458,7 @@ t1 SHOW CREATE TABLE t1; Table Create Table t1 CREATE TABLE `t1` ( - `c1` timestamp NOT NULL DEFAULT current_timestamp() ON UPDATE current_timestamp() + `c1` timestamp NOT NULL ) ENGINE=ENGINE DEFAULT CHARSET=latin1 ALTER TABLE t1 ADD c2 NUMERIC NOT NULL; SHOW TABLES; @@ -12467,7 +12467,7 @@ t1 SHOW CREATE TABLE t1; Table Create Table t1 CREATE TABLE `t1` ( - `c1` timestamp NOT NULL DEFAULT current_timestamp() ON UPDATE current_timestamp(), + `c1` timestamp NOT NULL, `c2` decimal(10,0) NOT NULL ) ENGINE=ENGINE DEFAULT CHARSET=latin1 DROP TABLE t1; @@ -13514,7 +13514,7 @@ t1 SHOW CREATE TABLE t1; Table Create Table t1 CREATE TABLE `t1` ( - `c1` timestamp NOT NULL DEFAULT current_timestamp() ON UPDATE current_timestamp() + `c1` timestamp NOT NULL ) ENGINE=ENGINE DEFAULT CHARSET=latin1 ALTER TABLE t1 ADD c2 DATE NOT NULL; SHOW TABLES; @@ -13523,7 +13523,7 @@ t1 SHOW CREATE TABLE t1; Table Create Table t1 CREATE TABLE `t1` ( - `c1` timestamp NOT NULL DEFAULT current_timestamp() ON UPDATE current_timestamp(), + `c1` timestamp NOT NULL, `c2` date NOT NULL ) ENGINE=ENGINE DEFAULT CHARSET=latin1 DROP TABLE t1; @@ -14570,7 +14570,7 @@ t1 SHOW CREATE TABLE t1; Table Create Table t1 CREATE TABLE `t1` ( - `c1` timestamp NOT NULL DEFAULT current_timestamp() ON UPDATE current_timestamp() + `c1` timestamp NOT NULL ) ENGINE=ENGINE DEFAULT CHARSET=latin1 ALTER TABLE t1 ADD c2 TIME NOT NULL; SHOW TABLES; @@ -14579,7 +14579,7 @@ t1 SHOW CREATE TABLE t1; Table Create Table t1 CREATE TABLE `t1` ( - `c1` timestamp NOT NULL DEFAULT current_timestamp() ON UPDATE current_timestamp(), + `c1` timestamp NOT NULL, `c2` time NOT NULL ) ENGINE=ENGINE DEFAULT CHARSET=latin1 DROP TABLE t1; @@ -15328,7 +15328,7 @@ SHOW CREATE TABLE t1; Table Create Table t1 CREATE TABLE `t1` ( `c1` bit(1) NOT NULL, - `c2` timestamp NOT NULL DEFAULT current_timestamp() ON UPDATE current_timestamp() + `c2` timestamp NOT NULL ) ENGINE=ENGINE DEFAULT CHARSET=latin1 DROP TABLE t1; SHOW TABLES; @@ -15350,7 +15350,7 @@ SHOW CREATE TABLE t1; Table Create Table t1 CREATE TABLE `t1` ( `c1` tinyint(4) NOT NULL, - `c2` timestamp NOT NULL DEFAULT current_timestamp() ON UPDATE current_timestamp() + `c2` timestamp NOT NULL ) ENGINE=ENGINE DEFAULT CHARSET=latin1 DROP TABLE t1; SHOW TABLES; @@ -15372,7 +15372,7 @@ SHOW CREATE TABLE t1; Table Create Table t1 CREATE TABLE `t1` ( `c1` smallint(6) NOT NULL, - `c2` timestamp NOT NULL DEFAULT current_timestamp() ON UPDATE current_timestamp() + `c2` timestamp NOT NULL ) ENGINE=ENGINE DEFAULT CHARSET=latin1 DROP TABLE t1; SHOW TABLES; @@ -15394,7 +15394,7 @@ SHOW CREATE TABLE t1; Table Create Table t1 CREATE TABLE `t1` ( `c1` mediumint(9) NOT NULL, - `c2` timestamp NOT NULL DEFAULT current_timestamp() ON UPDATE current_timestamp() + `c2` timestamp NOT NULL ) ENGINE=ENGINE DEFAULT CHARSET=latin1 DROP TABLE t1; SHOW TABLES; @@ -15416,7 +15416,7 @@ SHOW CREATE TABLE t1; Table Create Table t1 CREATE TABLE `t1` ( `c1` int(11) NOT NULL, - `c2` timestamp NOT NULL DEFAULT current_timestamp() ON UPDATE current_timestamp() + `c2` timestamp NOT NULL ) ENGINE=ENGINE DEFAULT CHARSET=latin1 DROP TABLE t1; SHOW TABLES; @@ -15438,7 +15438,7 @@ SHOW CREATE TABLE t1; Table Create Table t1 CREATE TABLE `t1` ( `c1` int(11) NOT NULL, - `c2` timestamp NOT NULL DEFAULT current_timestamp() ON UPDATE current_timestamp() + `c2` timestamp NOT NULL ) ENGINE=ENGINE DEFAULT CHARSET=latin1 DROP TABLE t1; SHOW TABLES; @@ -15460,7 +15460,7 @@ SHOW CREATE TABLE t1; Table Create Table t1 CREATE TABLE `t1` ( `c1` bigint(20) NOT NULL, - `c2` timestamp NOT NULL DEFAULT current_timestamp() ON UPDATE current_timestamp() + `c2` timestamp NOT NULL ) ENGINE=ENGINE DEFAULT CHARSET=latin1 DROP TABLE t1; SHOW TABLES; @@ -15482,7 +15482,7 @@ SHOW CREATE TABLE t1; Table Create Table t1 CREATE TABLE `t1` ( `c1` double NOT NULL, - `c2` timestamp NOT NULL DEFAULT current_timestamp() ON UPDATE current_timestamp() + `c2` timestamp NOT NULL ) ENGINE=ENGINE DEFAULT CHARSET=latin1 DROP TABLE t1; SHOW TABLES; @@ -15504,7 +15504,7 @@ SHOW CREATE TABLE t1; Table Create Table t1 CREATE TABLE `t1` ( `c1` double NOT NULL, - `c2` timestamp NOT NULL DEFAULT current_timestamp() ON UPDATE current_timestamp() + `c2` timestamp NOT NULL ) ENGINE=ENGINE DEFAULT CHARSET=latin1 DROP TABLE t1; SHOW TABLES; @@ -15526,7 +15526,7 @@ SHOW CREATE TABLE t1; Table Create Table t1 CREATE TABLE `t1` ( `c1` float NOT NULL, - `c2` timestamp NOT NULL DEFAULT current_timestamp() ON UPDATE current_timestamp() + `c2` timestamp NOT NULL ) ENGINE=ENGINE DEFAULT CHARSET=latin1 DROP TABLE t1; SHOW TABLES; @@ -15548,7 +15548,7 @@ SHOW CREATE TABLE t1; Table Create Table t1 CREATE TABLE `t1` ( `c1` decimal(10,0) NOT NULL, - `c2` timestamp NOT NULL DEFAULT current_timestamp() ON UPDATE current_timestamp() + `c2` timestamp NOT NULL ) ENGINE=ENGINE DEFAULT CHARSET=latin1 DROP TABLE t1; SHOW TABLES; @@ -15570,7 +15570,7 @@ SHOW CREATE TABLE t1; Table Create Table t1 CREATE TABLE `t1` ( `c1` decimal(10,0) NOT NULL, - `c2` timestamp NOT NULL DEFAULT current_timestamp() ON UPDATE current_timestamp() + `c2` timestamp NOT NULL ) ENGINE=ENGINE DEFAULT CHARSET=latin1 DROP TABLE t1; SHOW TABLES; @@ -15592,7 +15592,7 @@ SHOW CREATE TABLE t1; Table Create Table t1 CREATE TABLE `t1` ( `c1` date NOT NULL, - `c2` timestamp NOT NULL DEFAULT current_timestamp() ON UPDATE current_timestamp() + `c2` timestamp NOT NULL ) ENGINE=ENGINE DEFAULT CHARSET=latin1 DROP TABLE t1; SHOW TABLES; @@ -15614,7 +15614,7 @@ SHOW CREATE TABLE t1; Table Create Table t1 CREATE TABLE `t1` ( `c1` time NOT NULL, - `c2` timestamp NOT NULL DEFAULT current_timestamp() ON UPDATE current_timestamp() + `c2` timestamp NOT NULL ) ENGINE=ENGINE DEFAULT CHARSET=latin1 DROP TABLE t1; SHOW TABLES; @@ -15626,7 +15626,7 @@ t1 SHOW CREATE TABLE t1; Table Create Table t1 CREATE TABLE `t1` ( - `c1` timestamp NOT NULL DEFAULT current_timestamp() ON UPDATE current_timestamp() + `c1` timestamp NOT NULL ) ENGINE=ENGINE DEFAULT CHARSET=latin1 ALTER TABLE t1 ADD c2 TIMESTAMP NOT NULL; SHOW TABLES; @@ -15635,8 +15635,8 @@ t1 SHOW CREATE TABLE t1; Table Create Table t1 CREATE TABLE `t1` ( - `c1` timestamp NOT NULL DEFAULT current_timestamp() ON UPDATE current_timestamp(), - `c2` timestamp NOT NULL DEFAULT '0000-00-00 00:00:00' + `c1` timestamp NOT NULL, + `c2` timestamp NOT NULL ) ENGINE=ENGINE DEFAULT CHARSET=latin1 DROP TABLE t1; SHOW TABLES; @@ -15658,7 +15658,7 @@ SHOW CREATE TABLE t1; Table Create Table t1 CREATE TABLE `t1` ( `c1` year(4) NOT NULL, - `c2` timestamp NOT NULL DEFAULT current_timestamp() ON UPDATE current_timestamp() + `c2` timestamp NOT NULL ) ENGINE=ENGINE DEFAULT CHARSET=latin1 DROP TABLE t1; SHOW TABLES; @@ -15680,7 +15680,7 @@ SHOW CREATE TABLE t1; Table Create Table t1 CREATE TABLE `t1` ( `c1` tinyblob NOT NULL, - `c2` timestamp NOT NULL DEFAULT current_timestamp() ON UPDATE current_timestamp() + `c2` timestamp NOT NULL ) ENGINE=ENGINE DEFAULT CHARSET=latin1 DROP TABLE t1; SHOW TABLES; @@ -15702,7 +15702,7 @@ SHOW CREATE TABLE t1; Table Create Table t1 CREATE TABLE `t1` ( `c1` blob NOT NULL, - `c2` timestamp NOT NULL DEFAULT current_timestamp() ON UPDATE current_timestamp() + `c2` timestamp NOT NULL ) ENGINE=ENGINE DEFAULT CHARSET=latin1 DROP TABLE t1; SHOW TABLES; @@ -15724,7 +15724,7 @@ SHOW CREATE TABLE t1; Table Create Table t1 CREATE TABLE `t1` ( `c1` mediumblob NOT NULL, - `c2` timestamp NOT NULL DEFAULT current_timestamp() ON UPDATE current_timestamp() + `c2` timestamp NOT NULL ) ENGINE=ENGINE DEFAULT CHARSET=latin1 DROP TABLE t1; SHOW TABLES; @@ -15746,7 +15746,7 @@ SHOW CREATE TABLE t1; Table Create Table t1 CREATE TABLE `t1` ( `c1` longblob NOT NULL, - `c2` timestamp NOT NULL DEFAULT current_timestamp() ON UPDATE current_timestamp() + `c2` timestamp NOT NULL ) ENGINE=ENGINE DEFAULT CHARSET=latin1 DROP TABLE t1; SHOW TABLES; @@ -15768,7 +15768,7 @@ SHOW CREATE TABLE t1; Table Create Table t1 CREATE TABLE `t1` ( `c1` tinytext NOT NULL, - `c2` timestamp NOT NULL DEFAULT current_timestamp() ON UPDATE current_timestamp() + `c2` timestamp NOT NULL ) ENGINE=ENGINE DEFAULT CHARSET=latin1 DROP TABLE t1; SHOW TABLES; @@ -15790,7 +15790,7 @@ SHOW CREATE TABLE t1; Table Create Table t1 CREATE TABLE `t1` ( `c1` text NOT NULL, - `c2` timestamp NOT NULL DEFAULT current_timestamp() ON UPDATE current_timestamp() + `c2` timestamp NOT NULL ) ENGINE=ENGINE DEFAULT CHARSET=latin1 DROP TABLE t1; SHOW TABLES; @@ -15812,7 +15812,7 @@ SHOW CREATE TABLE t1; Table Create Table t1 CREATE TABLE `t1` ( `c1` mediumtext NOT NULL, - `c2` timestamp NOT NULL DEFAULT current_timestamp() ON UPDATE current_timestamp() + `c2` timestamp NOT NULL ) ENGINE=ENGINE DEFAULT CHARSET=latin1 DROP TABLE t1; SHOW TABLES; @@ -15834,7 +15834,7 @@ SHOW CREATE TABLE t1; Table Create Table t1 CREATE TABLE `t1` ( `c1` longtext NOT NULL, - `c2` timestamp NOT NULL DEFAULT current_timestamp() ON UPDATE current_timestamp() + `c2` timestamp NOT NULL ) ENGINE=ENGINE DEFAULT CHARSET=latin1 DROP TABLE t1; SHOW TABLES; @@ -16682,7 +16682,7 @@ t1 SHOW CREATE TABLE t1; Table Create Table t1 CREATE TABLE `t1` ( - `c1` timestamp NOT NULL DEFAULT current_timestamp() ON UPDATE current_timestamp() + `c1` timestamp NOT NULL ) ENGINE=ENGINE DEFAULT CHARSET=latin1 ALTER TABLE t1 ADD c2 YEAR NOT NULL; SHOW TABLES; @@ -16691,7 +16691,7 @@ t1 SHOW CREATE TABLE t1; Table Create Table t1 CREATE TABLE `t1` ( - `c1` timestamp NOT NULL DEFAULT current_timestamp() ON UPDATE current_timestamp(), + `c1` timestamp NOT NULL, `c2` year(4) NOT NULL ) ENGINE=ENGINE DEFAULT CHARSET=latin1 DROP TABLE t1; @@ -17738,7 +17738,7 @@ t1 SHOW CREATE TABLE t1; Table Create Table t1 CREATE TABLE `t1` ( - `c1` timestamp NOT NULL DEFAULT current_timestamp() ON UPDATE current_timestamp() + `c1` timestamp NOT NULL ) ENGINE=ENGINE DEFAULT CHARSET=latin1 ALTER TABLE t1 ADD c2 TINYBLOB NOT NULL; SHOW TABLES; @@ -17747,7 +17747,7 @@ t1 SHOW CREATE TABLE t1; Table Create Table t1 CREATE TABLE `t1` ( - `c1` timestamp NOT NULL DEFAULT current_timestamp() ON UPDATE current_timestamp(), + `c1` timestamp NOT NULL, `c2` tinyblob NOT NULL ) ENGINE=ENGINE DEFAULT CHARSET=latin1 DROP TABLE t1; @@ -18794,7 +18794,7 @@ t1 SHOW CREATE TABLE t1; Table Create Table t1 CREATE TABLE `t1` ( - `c1` timestamp NOT NULL DEFAULT current_timestamp() ON UPDATE current_timestamp() + `c1` timestamp NOT NULL ) ENGINE=ENGINE DEFAULT CHARSET=latin1 ALTER TABLE t1 ADD c2 BLOB NOT NULL; SHOW TABLES; @@ -18803,7 +18803,7 @@ t1 SHOW CREATE TABLE t1; Table Create Table t1 CREATE TABLE `t1` ( - `c1` timestamp NOT NULL DEFAULT current_timestamp() ON UPDATE current_timestamp(), + `c1` timestamp NOT NULL, `c2` blob NOT NULL ) ENGINE=ENGINE DEFAULT CHARSET=latin1 DROP TABLE t1; @@ -19850,7 +19850,7 @@ t1 SHOW CREATE TABLE t1; Table Create Table t1 CREATE TABLE `t1` ( - `c1` timestamp NOT NULL DEFAULT current_timestamp() ON UPDATE current_timestamp() + `c1` timestamp NOT NULL ) ENGINE=ENGINE DEFAULT CHARSET=latin1 ALTER TABLE t1 ADD c2 MEDIUMBLOB NOT NULL; SHOW TABLES; @@ -19859,7 +19859,7 @@ t1 SHOW CREATE TABLE t1; Table Create Table t1 CREATE TABLE `t1` ( - `c1` timestamp NOT NULL DEFAULT current_timestamp() ON UPDATE current_timestamp(), + `c1` timestamp NOT NULL, `c2` mediumblob NOT NULL ) ENGINE=ENGINE DEFAULT CHARSET=latin1 DROP TABLE t1; @@ -20906,7 +20906,7 @@ t1 SHOW CREATE TABLE t1; Table Create Table t1 CREATE TABLE `t1` ( - `c1` timestamp NOT NULL DEFAULT current_timestamp() ON UPDATE current_timestamp() + `c1` timestamp NOT NULL ) ENGINE=ENGINE DEFAULT CHARSET=latin1 ALTER TABLE t1 ADD c2 LONGBLOB NOT NULL; SHOW TABLES; @@ -20915,7 +20915,7 @@ t1 SHOW CREATE TABLE t1; Table Create Table t1 CREATE TABLE `t1` ( - `c1` timestamp NOT NULL DEFAULT current_timestamp() ON UPDATE current_timestamp(), + `c1` timestamp NOT NULL, `c2` longblob NOT NULL ) ENGINE=ENGINE DEFAULT CHARSET=latin1 DROP TABLE t1; @@ -21962,7 +21962,7 @@ t1 SHOW CREATE TABLE t1; Table Create Table t1 CREATE TABLE `t1` ( - `c1` timestamp NOT NULL DEFAULT current_timestamp() ON UPDATE current_timestamp() + `c1` timestamp NOT NULL ) ENGINE=ENGINE DEFAULT CHARSET=latin1 ALTER TABLE t1 ADD c2 TINYTEXT NOT NULL; SHOW TABLES; @@ -21971,7 +21971,7 @@ t1 SHOW CREATE TABLE t1; Table Create Table t1 CREATE TABLE `t1` ( - `c1` timestamp NOT NULL DEFAULT current_timestamp() ON UPDATE current_timestamp(), + `c1` timestamp NOT NULL, `c2` tinytext NOT NULL ) ENGINE=ENGINE DEFAULT CHARSET=latin1 DROP TABLE t1; @@ -23018,7 +23018,7 @@ t1 SHOW CREATE TABLE t1; Table Create Table t1 CREATE TABLE `t1` ( - `c1` timestamp NOT NULL DEFAULT current_timestamp() ON UPDATE current_timestamp() + `c1` timestamp NOT NULL ) ENGINE=ENGINE DEFAULT CHARSET=latin1 ALTER TABLE t1 ADD c2 TEXT NOT NULL; SHOW TABLES; @@ -23027,7 +23027,7 @@ t1 SHOW CREATE TABLE t1; Table Create Table t1 CREATE TABLE `t1` ( - `c1` timestamp NOT NULL DEFAULT current_timestamp() ON UPDATE current_timestamp(), + `c1` timestamp NOT NULL, `c2` text NOT NULL ) ENGINE=ENGINE DEFAULT CHARSET=latin1 DROP TABLE t1; @@ -24074,7 +24074,7 @@ t1 SHOW CREATE TABLE t1; Table Create Table t1 CREATE TABLE `t1` ( - `c1` timestamp NOT NULL DEFAULT current_timestamp() ON UPDATE current_timestamp() + `c1` timestamp NOT NULL ) ENGINE=ENGINE DEFAULT CHARSET=latin1 ALTER TABLE t1 ADD c2 MEDIUMTEXT NOT NULL; SHOW TABLES; @@ -24083,7 +24083,7 @@ t1 SHOW CREATE TABLE t1; Table Create Table t1 CREATE TABLE `t1` ( - `c1` timestamp NOT NULL DEFAULT current_timestamp() ON UPDATE current_timestamp(), + `c1` timestamp NOT NULL, `c2` mediumtext NOT NULL ) ENGINE=ENGINE DEFAULT CHARSET=latin1 DROP TABLE t1; @@ -25130,7 +25130,7 @@ t1 SHOW CREATE TABLE t1; Table Create Table t1 CREATE TABLE `t1` ( - `c1` timestamp NOT NULL DEFAULT current_timestamp() ON UPDATE current_timestamp() + `c1` timestamp NOT NULL ) ENGINE=ENGINE DEFAULT CHARSET=latin1 ALTER TABLE t1 ADD c2 LONGTEXT NOT NULL; SHOW TABLES; @@ -25139,7 +25139,7 @@ t1 SHOW CREATE TABLE t1; Table Create Table t1 CREATE TABLE `t1` ( - `c1` timestamp NOT NULL DEFAULT current_timestamp() ON UPDATE current_timestamp(), + `c1` timestamp NOT NULL, `c2` longtext NOT NULL ) ENGINE=ENGINE DEFAULT CHARSET=latin1 DROP TABLE t1; diff --git a/mysql-test/suite/engines/funcs/r/ta_add_column2.result b/mysql-test/suite/engines/funcs/r/ta_add_column2.result index cf376f736fb..2300149d6cd 100644 --- a/mysql-test/suite/engines/funcs/r/ta_add_column2.result +++ b/mysql-test/suite/engines/funcs/r/ta_add_column2.result @@ -2568,7 +2568,7 @@ SHOW CREATE TABLE t1; Table Create Table t1 CREATE TABLE `t1` ( `c1` char(15) NOT NULL, - `c2` timestamp NOT NULL DEFAULT current_timestamp() ON UPDATE current_timestamp() + `c2` timestamp NOT NULL ) ENGINE=ENGINE DEFAULT CHARSET=latin1 DROP TABLE t1; SHOW TABLES; @@ -2590,7 +2590,7 @@ SHOW CREATE TABLE t1; Table Create Table t1 CREATE TABLE `t1` ( `c1` varchar(15) NOT NULL, - `c2` timestamp NOT NULL DEFAULT current_timestamp() ON UPDATE current_timestamp() + `c2` timestamp NOT NULL ) ENGINE=ENGINE DEFAULT CHARSET=latin1 DROP TABLE t1; SHOW TABLES; @@ -2612,7 +2612,7 @@ SHOW CREATE TABLE t1; Table Create Table t1 CREATE TABLE `t1` ( `c1` binary(15) NOT NULL, - `c2` timestamp NOT NULL DEFAULT current_timestamp() ON UPDATE current_timestamp() + `c2` timestamp NOT NULL ) ENGINE=ENGINE DEFAULT CHARSET=latin1 DROP TABLE t1; SHOW TABLES; @@ -2634,7 +2634,7 @@ SHOW CREATE TABLE t1; Table Create Table t1 CREATE TABLE `t1` ( `c1` varbinary(15) NOT NULL, - `c2` timestamp NOT NULL DEFAULT current_timestamp() ON UPDATE current_timestamp() + `c2` timestamp NOT NULL ) ENGINE=ENGINE DEFAULT CHARSET=latin1 DROP TABLE t1; SHOW TABLES; diff --git a/mysql-test/suite/engines/funcs/r/ta_add_column_first.result b/mysql-test/suite/engines/funcs/r/ta_add_column_first.result index 6007bbe4de6..650bec26ac8 100644 --- a/mysql-test/suite/engines/funcs/r/ta_add_column_first.result +++ b/mysql-test/suite/engines/funcs/r/ta_add_column_first.result @@ -842,7 +842,7 @@ t1 SHOW CREATE TABLE t1; Table Create Table t1 CREATE TABLE `t1` ( - `c1` timestamp NOT NULL DEFAULT current_timestamp() ON UPDATE current_timestamp() + `c1` timestamp NOT NULL ) ENGINE=ENGINE DEFAULT CHARSET=latin1 ALTER TABLE t1 ADD c2 BIT NOT NULL FIRST; SHOW TABLES; @@ -852,7 +852,7 @@ SHOW CREATE TABLE t1; Table Create Table t1 CREATE TABLE `t1` ( `c2` bit(1) NOT NULL, - `c1` timestamp NOT NULL DEFAULT current_timestamp() ON UPDATE current_timestamp() + `c1` timestamp NOT NULL ) ENGINE=ENGINE DEFAULT CHARSET=latin1 DROP TABLE t1; SHOW TABLES; @@ -1898,7 +1898,7 @@ t1 SHOW CREATE TABLE t1; Table Create Table t1 CREATE TABLE `t1` ( - `c1` timestamp NOT NULL DEFAULT current_timestamp() ON UPDATE current_timestamp() + `c1` timestamp NOT NULL ) ENGINE=ENGINE DEFAULT CHARSET=latin1 ALTER TABLE t1 ADD c2 TINYINT NOT NULL FIRST; SHOW TABLES; @@ -1908,7 +1908,7 @@ SHOW CREATE TABLE t1; Table Create Table t1 CREATE TABLE `t1` ( `c2` tinyint(4) NOT NULL, - `c1` timestamp NOT NULL DEFAULT current_timestamp() ON UPDATE current_timestamp() + `c1` timestamp NOT NULL ) ENGINE=ENGINE DEFAULT CHARSET=latin1 DROP TABLE t1; SHOW TABLES; @@ -2954,7 +2954,7 @@ t1 SHOW CREATE TABLE t1; Table Create Table t1 CREATE TABLE `t1` ( - `c1` timestamp NOT NULL DEFAULT current_timestamp() ON UPDATE current_timestamp() + `c1` timestamp NOT NULL ) ENGINE=ENGINE DEFAULT CHARSET=latin1 ALTER TABLE t1 ADD c2 SMALLINT NOT NULL FIRST; SHOW TABLES; @@ -2964,7 +2964,7 @@ SHOW CREATE TABLE t1; Table Create Table t1 CREATE TABLE `t1` ( `c2` smallint(6) NOT NULL, - `c1` timestamp NOT NULL DEFAULT current_timestamp() ON UPDATE current_timestamp() + `c1` timestamp NOT NULL ) ENGINE=ENGINE DEFAULT CHARSET=latin1 DROP TABLE t1; SHOW TABLES; @@ -4010,7 +4010,7 @@ t1 SHOW CREATE TABLE t1; Table Create Table t1 CREATE TABLE `t1` ( - `c1` timestamp NOT NULL DEFAULT current_timestamp() ON UPDATE current_timestamp() + `c1` timestamp NOT NULL ) ENGINE=ENGINE DEFAULT CHARSET=latin1 ALTER TABLE t1 ADD c2 MEDIUMINT NOT NULL FIRST; SHOW TABLES; @@ -4020,7 +4020,7 @@ SHOW CREATE TABLE t1; Table Create Table t1 CREATE TABLE `t1` ( `c2` mediumint(9) NOT NULL, - `c1` timestamp NOT NULL DEFAULT current_timestamp() ON UPDATE current_timestamp() + `c1` timestamp NOT NULL ) ENGINE=ENGINE DEFAULT CHARSET=latin1 DROP TABLE t1; SHOW TABLES; @@ -5066,7 +5066,7 @@ t1 SHOW CREATE TABLE t1; Table Create Table t1 CREATE TABLE `t1` ( - `c1` timestamp NOT NULL DEFAULT current_timestamp() ON UPDATE current_timestamp() + `c1` timestamp NOT NULL ) ENGINE=ENGINE DEFAULT CHARSET=latin1 ALTER TABLE t1 ADD c2 INT NOT NULL FIRST; SHOW TABLES; @@ -5076,7 +5076,7 @@ SHOW CREATE TABLE t1; Table Create Table t1 CREATE TABLE `t1` ( `c2` int(11) NOT NULL, - `c1` timestamp NOT NULL DEFAULT current_timestamp() ON UPDATE current_timestamp() + `c1` timestamp NOT NULL ) ENGINE=ENGINE DEFAULT CHARSET=latin1 DROP TABLE t1; SHOW TABLES; @@ -6122,7 +6122,7 @@ t1 SHOW CREATE TABLE t1; Table Create Table t1 CREATE TABLE `t1` ( - `c1` timestamp NOT NULL DEFAULT current_timestamp() ON UPDATE current_timestamp() + `c1` timestamp NOT NULL ) ENGINE=ENGINE DEFAULT CHARSET=latin1 ALTER TABLE t1 ADD c2 INTEGER NOT NULL FIRST; SHOW TABLES; @@ -6132,7 +6132,7 @@ SHOW CREATE TABLE t1; Table Create Table t1 CREATE TABLE `t1` ( `c2` int(11) NOT NULL, - `c1` timestamp NOT NULL DEFAULT current_timestamp() ON UPDATE current_timestamp() + `c1` timestamp NOT NULL ) ENGINE=ENGINE DEFAULT CHARSET=latin1 DROP TABLE t1; SHOW TABLES; @@ -7178,7 +7178,7 @@ t1 SHOW CREATE TABLE t1; Table Create Table t1 CREATE TABLE `t1` ( - `c1` timestamp NOT NULL DEFAULT current_timestamp() ON UPDATE current_timestamp() + `c1` timestamp NOT NULL ) ENGINE=ENGINE DEFAULT CHARSET=latin1 ALTER TABLE t1 ADD c2 BIGINT NOT NULL FIRST; SHOW TABLES; @@ -7188,7 +7188,7 @@ SHOW CREATE TABLE t1; Table Create Table t1 CREATE TABLE `t1` ( `c2` bigint(20) NOT NULL, - `c1` timestamp NOT NULL DEFAULT current_timestamp() ON UPDATE current_timestamp() + `c1` timestamp NOT NULL ) ENGINE=ENGINE DEFAULT CHARSET=latin1 DROP TABLE t1; SHOW TABLES; @@ -8234,7 +8234,7 @@ t1 SHOW CREATE TABLE t1; Table Create Table t1 CREATE TABLE `t1` ( - `c1` timestamp NOT NULL DEFAULT current_timestamp() ON UPDATE current_timestamp() + `c1` timestamp NOT NULL ) ENGINE=ENGINE DEFAULT CHARSET=latin1 ALTER TABLE t1 ADD c2 REAL NOT NULL FIRST; SHOW TABLES; @@ -8244,7 +8244,7 @@ SHOW CREATE TABLE t1; Table Create Table t1 CREATE TABLE `t1` ( `c2` double NOT NULL, - `c1` timestamp NOT NULL DEFAULT current_timestamp() ON UPDATE current_timestamp() + `c1` timestamp NOT NULL ) ENGINE=ENGINE DEFAULT CHARSET=latin1 DROP TABLE t1; SHOW TABLES; @@ -9290,7 +9290,7 @@ t1 SHOW CREATE TABLE t1; Table Create Table t1 CREATE TABLE `t1` ( - `c1` timestamp NOT NULL DEFAULT current_timestamp() ON UPDATE current_timestamp() + `c1` timestamp NOT NULL ) ENGINE=ENGINE DEFAULT CHARSET=latin1 ALTER TABLE t1 ADD c2 DOUBLE NOT NULL FIRST; SHOW TABLES; @@ -9300,7 +9300,7 @@ SHOW CREATE TABLE t1; Table Create Table t1 CREATE TABLE `t1` ( `c2` double NOT NULL, - `c1` timestamp NOT NULL DEFAULT current_timestamp() ON UPDATE current_timestamp() + `c1` timestamp NOT NULL ) ENGINE=ENGINE DEFAULT CHARSET=latin1 DROP TABLE t1; SHOW TABLES; @@ -10346,7 +10346,7 @@ t1 SHOW CREATE TABLE t1; Table Create Table t1 CREATE TABLE `t1` ( - `c1` timestamp NOT NULL DEFAULT current_timestamp() ON UPDATE current_timestamp() + `c1` timestamp NOT NULL ) ENGINE=ENGINE DEFAULT CHARSET=latin1 ALTER TABLE t1 ADD c2 FLOAT NOT NULL FIRST; SHOW TABLES; @@ -10356,7 +10356,7 @@ SHOW CREATE TABLE t1; Table Create Table t1 CREATE TABLE `t1` ( `c2` float NOT NULL, - `c1` timestamp NOT NULL DEFAULT current_timestamp() ON UPDATE current_timestamp() + `c1` timestamp NOT NULL ) ENGINE=ENGINE DEFAULT CHARSET=latin1 DROP TABLE t1; SHOW TABLES; @@ -11402,7 +11402,7 @@ t1 SHOW CREATE TABLE t1; Table Create Table t1 CREATE TABLE `t1` ( - `c1` timestamp NOT NULL DEFAULT current_timestamp() ON UPDATE current_timestamp() + `c1` timestamp NOT NULL ) ENGINE=ENGINE DEFAULT CHARSET=latin1 ALTER TABLE t1 ADD c2 DECIMAL NOT NULL FIRST; SHOW TABLES; @@ -11412,7 +11412,7 @@ SHOW CREATE TABLE t1; Table Create Table t1 CREATE TABLE `t1` ( `c2` decimal(10,0) NOT NULL, - `c1` timestamp NOT NULL DEFAULT current_timestamp() ON UPDATE current_timestamp() + `c1` timestamp NOT NULL ) ENGINE=ENGINE DEFAULT CHARSET=latin1 DROP TABLE t1; SHOW TABLES; @@ -12458,7 +12458,7 @@ t1 SHOW CREATE TABLE t1; Table Create Table t1 CREATE TABLE `t1` ( - `c1` timestamp NOT NULL DEFAULT current_timestamp() ON UPDATE current_timestamp() + `c1` timestamp NOT NULL ) ENGINE=ENGINE DEFAULT CHARSET=latin1 ALTER TABLE t1 ADD c2 NUMERIC NOT NULL FIRST; SHOW TABLES; @@ -12468,7 +12468,7 @@ SHOW CREATE TABLE t1; Table Create Table t1 CREATE TABLE `t1` ( `c2` decimal(10,0) NOT NULL, - `c1` timestamp NOT NULL DEFAULT current_timestamp() ON UPDATE current_timestamp() + `c1` timestamp NOT NULL ) ENGINE=ENGINE DEFAULT CHARSET=latin1 DROP TABLE t1; SHOW TABLES; @@ -13514,7 +13514,7 @@ t1 SHOW CREATE TABLE t1; Table Create Table t1 CREATE TABLE `t1` ( - `c1` timestamp NOT NULL DEFAULT current_timestamp() ON UPDATE current_timestamp() + `c1` timestamp NOT NULL ) ENGINE=ENGINE DEFAULT CHARSET=latin1 ALTER TABLE t1 ADD c2 DATE NOT NULL FIRST; SHOW TABLES; @@ -13524,7 +13524,7 @@ SHOW CREATE TABLE t1; Table Create Table t1 CREATE TABLE `t1` ( `c2` date NOT NULL, - `c1` timestamp NOT NULL DEFAULT current_timestamp() ON UPDATE current_timestamp() + `c1` timestamp NOT NULL ) ENGINE=ENGINE DEFAULT CHARSET=latin1 DROP TABLE t1; SHOW TABLES; @@ -14570,7 +14570,7 @@ t1 SHOW CREATE TABLE t1; Table Create Table t1 CREATE TABLE `t1` ( - `c1` timestamp NOT NULL DEFAULT current_timestamp() ON UPDATE current_timestamp() + `c1` timestamp NOT NULL ) ENGINE=ENGINE DEFAULT CHARSET=latin1 ALTER TABLE t1 ADD c2 TIME NOT NULL FIRST; SHOW TABLES; @@ -14580,7 +14580,7 @@ SHOW CREATE TABLE t1; Table Create Table t1 CREATE TABLE `t1` ( `c2` time NOT NULL, - `c1` timestamp NOT NULL DEFAULT current_timestamp() ON UPDATE current_timestamp() + `c1` timestamp NOT NULL ) ENGINE=ENGINE DEFAULT CHARSET=latin1 DROP TABLE t1; SHOW TABLES; @@ -15626,7 +15626,7 @@ t1 SHOW CREATE TABLE t1; Table Create Table t1 CREATE TABLE `t1` ( - `c1` timestamp NOT NULL DEFAULT current_timestamp() ON UPDATE current_timestamp() + `c1` timestamp NOT NULL ) ENGINE=ENGINE DEFAULT CHARSET=latin1 ALTER TABLE t1 ADD c2 YEAR NOT NULL FIRST; SHOW TABLES; @@ -15636,7 +15636,7 @@ SHOW CREATE TABLE t1; Table Create Table t1 CREATE TABLE `t1` ( `c2` year(4) NOT NULL, - `c1` timestamp NOT NULL DEFAULT current_timestamp() ON UPDATE current_timestamp() + `c1` timestamp NOT NULL ) ENGINE=ENGINE DEFAULT CHARSET=latin1 DROP TABLE t1; SHOW TABLES; @@ -16682,7 +16682,7 @@ t1 SHOW CREATE TABLE t1; Table Create Table t1 CREATE TABLE `t1` ( - `c1` timestamp NOT NULL DEFAULT current_timestamp() ON UPDATE current_timestamp() + `c1` timestamp NOT NULL ) ENGINE=ENGINE DEFAULT CHARSET=latin1 ALTER TABLE t1 ADD c2 TINYBLOB NOT NULL FIRST; SHOW TABLES; @@ -16692,7 +16692,7 @@ SHOW CREATE TABLE t1; Table Create Table t1 CREATE TABLE `t1` ( `c2` tinyblob NOT NULL, - `c1` timestamp NOT NULL DEFAULT current_timestamp() ON UPDATE current_timestamp() + `c1` timestamp NOT NULL ) ENGINE=ENGINE DEFAULT CHARSET=latin1 DROP TABLE t1; SHOW TABLES; @@ -17738,7 +17738,7 @@ t1 SHOW CREATE TABLE t1; Table Create Table t1 CREATE TABLE `t1` ( - `c1` timestamp NOT NULL DEFAULT current_timestamp() ON UPDATE current_timestamp() + `c1` timestamp NOT NULL ) ENGINE=ENGINE DEFAULT CHARSET=latin1 ALTER TABLE t1 ADD c2 BLOB NOT NULL FIRST; SHOW TABLES; @@ -17748,7 +17748,7 @@ SHOW CREATE TABLE t1; Table Create Table t1 CREATE TABLE `t1` ( `c2` blob NOT NULL, - `c1` timestamp NOT NULL DEFAULT current_timestamp() ON UPDATE current_timestamp() + `c1` timestamp NOT NULL ) ENGINE=ENGINE DEFAULT CHARSET=latin1 DROP TABLE t1; SHOW TABLES; @@ -18794,7 +18794,7 @@ t1 SHOW CREATE TABLE t1; Table Create Table t1 CREATE TABLE `t1` ( - `c1` timestamp NOT NULL DEFAULT current_timestamp() ON UPDATE current_timestamp() + `c1` timestamp NOT NULL ) ENGINE=ENGINE DEFAULT CHARSET=latin1 ALTER TABLE t1 ADD c2 MEDIUMBLOB NOT NULL FIRST; SHOW TABLES; @@ -18804,7 +18804,7 @@ SHOW CREATE TABLE t1; Table Create Table t1 CREATE TABLE `t1` ( `c2` mediumblob NOT NULL, - `c1` timestamp NOT NULL DEFAULT current_timestamp() ON UPDATE current_timestamp() + `c1` timestamp NOT NULL ) ENGINE=ENGINE DEFAULT CHARSET=latin1 DROP TABLE t1; SHOW TABLES; @@ -19850,7 +19850,7 @@ t1 SHOW CREATE TABLE t1; Table Create Table t1 CREATE TABLE `t1` ( - `c1` timestamp NOT NULL DEFAULT current_timestamp() ON UPDATE current_timestamp() + `c1` timestamp NOT NULL ) ENGINE=ENGINE DEFAULT CHARSET=latin1 ALTER TABLE t1 ADD c2 LONGBLOB NOT NULL FIRST; SHOW TABLES; @@ -19860,7 +19860,7 @@ SHOW CREATE TABLE t1; Table Create Table t1 CREATE TABLE `t1` ( `c2` longblob NOT NULL, - `c1` timestamp NOT NULL DEFAULT current_timestamp() ON UPDATE current_timestamp() + `c1` timestamp NOT NULL ) ENGINE=ENGINE DEFAULT CHARSET=latin1 DROP TABLE t1; SHOW TABLES; @@ -20906,7 +20906,7 @@ t1 SHOW CREATE TABLE t1; Table Create Table t1 CREATE TABLE `t1` ( - `c1` timestamp NOT NULL DEFAULT current_timestamp() ON UPDATE current_timestamp() + `c1` timestamp NOT NULL ) ENGINE=ENGINE DEFAULT CHARSET=latin1 ALTER TABLE t1 ADD c2 TINYTEXT NOT NULL FIRST; SHOW TABLES; @@ -20916,7 +20916,7 @@ SHOW CREATE TABLE t1; Table Create Table t1 CREATE TABLE `t1` ( `c2` tinytext NOT NULL, - `c1` timestamp NOT NULL DEFAULT current_timestamp() ON UPDATE current_timestamp() + `c1` timestamp NOT NULL ) ENGINE=ENGINE DEFAULT CHARSET=latin1 DROP TABLE t1; SHOW TABLES; @@ -21962,7 +21962,7 @@ t1 SHOW CREATE TABLE t1; Table Create Table t1 CREATE TABLE `t1` ( - `c1` timestamp NOT NULL DEFAULT current_timestamp() ON UPDATE current_timestamp() + `c1` timestamp NOT NULL ) ENGINE=ENGINE DEFAULT CHARSET=latin1 ALTER TABLE t1 ADD c2 TEXT NOT NULL FIRST; SHOW TABLES; @@ -21972,7 +21972,7 @@ SHOW CREATE TABLE t1; Table Create Table t1 CREATE TABLE `t1` ( `c2` text NOT NULL, - `c1` timestamp NOT NULL DEFAULT current_timestamp() ON UPDATE current_timestamp() + `c1` timestamp NOT NULL ) ENGINE=ENGINE DEFAULT CHARSET=latin1 DROP TABLE t1; SHOW TABLES; @@ -23018,7 +23018,7 @@ t1 SHOW CREATE TABLE t1; Table Create Table t1 CREATE TABLE `t1` ( - `c1` timestamp NOT NULL DEFAULT current_timestamp() ON UPDATE current_timestamp() + `c1` timestamp NOT NULL ) ENGINE=ENGINE DEFAULT CHARSET=latin1 ALTER TABLE t1 ADD c2 MEDIUMTEXT NOT NULL FIRST; SHOW TABLES; @@ -23028,7 +23028,7 @@ SHOW CREATE TABLE t1; Table Create Table t1 CREATE TABLE `t1` ( `c2` mediumtext NOT NULL, - `c1` timestamp NOT NULL DEFAULT current_timestamp() ON UPDATE current_timestamp() + `c1` timestamp NOT NULL ) ENGINE=ENGINE DEFAULT CHARSET=latin1 DROP TABLE t1; SHOW TABLES; @@ -24074,7 +24074,7 @@ t1 SHOW CREATE TABLE t1; Table Create Table t1 CREATE TABLE `t1` ( - `c1` timestamp NOT NULL DEFAULT current_timestamp() ON UPDATE current_timestamp() + `c1` timestamp NOT NULL ) ENGINE=ENGINE DEFAULT CHARSET=latin1 ALTER TABLE t1 ADD c2 LONGTEXT NOT NULL FIRST; SHOW TABLES; @@ -24084,7 +24084,7 @@ SHOW CREATE TABLE t1; Table Create Table t1 CREATE TABLE `t1` ( `c2` longtext NOT NULL, - `c1` timestamp NOT NULL DEFAULT current_timestamp() ON UPDATE current_timestamp() + `c1` timestamp NOT NULL ) ENGINE=ENGINE DEFAULT CHARSET=latin1 DROP TABLE t1; SHOW TABLES; diff --git a/mysql-test/suite/engines/funcs/r/ta_add_column_first2.result b/mysql-test/suite/engines/funcs/r/ta_add_column_first2.result index 5555215a5ec..18f98749f91 100644 --- a/mysql-test/suite/engines/funcs/r/ta_add_column_first2.result +++ b/mysql-test/suite/engines/funcs/r/ta_add_column_first2.result @@ -2567,7 +2567,7 @@ t1 SHOW CREATE TABLE t1; Table Create Table t1 CREATE TABLE `t1` ( - `c2` timestamp NOT NULL DEFAULT current_timestamp() ON UPDATE current_timestamp(), + `c2` timestamp NOT NULL, `c1` char(15) NOT NULL ) ENGINE=ENGINE DEFAULT CHARSET=latin1 DROP TABLE t1; @@ -2589,7 +2589,7 @@ t1 SHOW CREATE TABLE t1; Table Create Table t1 CREATE TABLE `t1` ( - `c2` timestamp NOT NULL DEFAULT current_timestamp() ON UPDATE current_timestamp(), + `c2` timestamp NOT NULL, `c1` varchar(15) NOT NULL ) ENGINE=ENGINE DEFAULT CHARSET=latin1 DROP TABLE t1; @@ -2611,7 +2611,7 @@ t1 SHOW CREATE TABLE t1; Table Create Table t1 CREATE TABLE `t1` ( - `c2` timestamp NOT NULL DEFAULT current_timestamp() ON UPDATE current_timestamp(), + `c2` timestamp NOT NULL, `c1` binary(15) NOT NULL ) ENGINE=ENGINE DEFAULT CHARSET=latin1 DROP TABLE t1; @@ -2633,7 +2633,7 @@ t1 SHOW CREATE TABLE t1; Table Create Table t1 CREATE TABLE `t1` ( - `c2` timestamp NOT NULL DEFAULT current_timestamp() ON UPDATE current_timestamp(), + `c2` timestamp NOT NULL, `c1` varbinary(15) NOT NULL ) ENGINE=ENGINE DEFAULT CHARSET=latin1 DROP TABLE t1; diff --git a/mysql-test/suite/engines/funcs/r/ta_add_column_middle.result b/mysql-test/suite/engines/funcs/r/ta_add_column_middle.result index 47c17aba9ab..ea30bd05295 100644 --- a/mysql-test/suite/engines/funcs/r/ta_add_column_middle.result +++ b/mysql-test/suite/engines/funcs/r/ta_add_column_middle.result @@ -1071,8 +1071,8 @@ SHOW CREATE TABLE t1; Table Create Table t1 CREATE TABLE `t1` ( `c1` int(11) NOT NULL, - `c2` timestamp NOT NULL DEFAULT current_timestamp() ON UPDATE current_timestamp(), - `c3` timestamp NOT NULL DEFAULT '0000-00-00 00:00:00', + `c2` timestamp NOT NULL, + `c3` timestamp NOT NULL, PRIMARY KEY (`c1`) ) ENGINE=ENGINE DEFAULT CHARSET=latin1 ALTER TABLE t1 ADD c4 BIT NOT NULL AFTER c2; @@ -1083,9 +1083,9 @@ SHOW CREATE TABLE t1; Table Create Table t1 CREATE TABLE `t1` ( `c1` int(11) NOT NULL, - `c2` timestamp NOT NULL DEFAULT current_timestamp() ON UPDATE current_timestamp(), + `c2` timestamp NOT NULL, `c4` bit(1) NOT NULL, - `c3` timestamp NOT NULL DEFAULT '0000-00-00 00:00:00', + `c3` timestamp NOT NULL, PRIMARY KEY (`c1`) ) ENGINE=ENGINE DEFAULT CHARSET=latin1 DROP TABLE t1; @@ -2415,8 +2415,8 @@ SHOW CREATE TABLE t1; Table Create Table t1 CREATE TABLE `t1` ( `c1` int(11) NOT NULL, - `c2` timestamp NOT NULL DEFAULT current_timestamp() ON UPDATE current_timestamp(), - `c3` timestamp NOT NULL DEFAULT '0000-00-00 00:00:00', + `c2` timestamp NOT NULL, + `c3` timestamp NOT NULL, PRIMARY KEY (`c1`) ) ENGINE=ENGINE DEFAULT CHARSET=latin1 ALTER TABLE t1 ADD c4 TINYINT NOT NULL AFTER c2; @@ -2427,9 +2427,9 @@ SHOW CREATE TABLE t1; Table Create Table t1 CREATE TABLE `t1` ( `c1` int(11) NOT NULL, - `c2` timestamp NOT NULL DEFAULT current_timestamp() ON UPDATE current_timestamp(), + `c2` timestamp NOT NULL, `c4` tinyint(4) NOT NULL, - `c3` timestamp NOT NULL DEFAULT '0000-00-00 00:00:00', + `c3` timestamp NOT NULL, PRIMARY KEY (`c1`) ) ENGINE=ENGINE DEFAULT CHARSET=latin1 DROP TABLE t1; @@ -3759,8 +3759,8 @@ SHOW CREATE TABLE t1; Table Create Table t1 CREATE TABLE `t1` ( `c1` int(11) NOT NULL, - `c2` timestamp NOT NULL DEFAULT current_timestamp() ON UPDATE current_timestamp(), - `c3` timestamp NOT NULL DEFAULT '0000-00-00 00:00:00', + `c2` timestamp NOT NULL, + `c3` timestamp NOT NULL, PRIMARY KEY (`c1`) ) ENGINE=ENGINE DEFAULT CHARSET=latin1 ALTER TABLE t1 ADD c4 SMALLINT NOT NULL AFTER c2; @@ -3771,9 +3771,9 @@ SHOW CREATE TABLE t1; Table Create Table t1 CREATE TABLE `t1` ( `c1` int(11) NOT NULL, - `c2` timestamp NOT NULL DEFAULT current_timestamp() ON UPDATE current_timestamp(), + `c2` timestamp NOT NULL, `c4` smallint(6) NOT NULL, - `c3` timestamp NOT NULL DEFAULT '0000-00-00 00:00:00', + `c3` timestamp NOT NULL, PRIMARY KEY (`c1`) ) ENGINE=ENGINE DEFAULT CHARSET=latin1 DROP TABLE t1; @@ -5103,8 +5103,8 @@ SHOW CREATE TABLE t1; Table Create Table t1 CREATE TABLE `t1` ( `c1` int(11) NOT NULL, - `c2` timestamp NOT NULL DEFAULT current_timestamp() ON UPDATE current_timestamp(), - `c3` timestamp NOT NULL DEFAULT '0000-00-00 00:00:00', + `c2` timestamp NOT NULL, + `c3` timestamp NOT NULL, PRIMARY KEY (`c1`) ) ENGINE=ENGINE DEFAULT CHARSET=latin1 ALTER TABLE t1 ADD c4 MEDIUMINT NOT NULL AFTER c2; @@ -5115,9 +5115,9 @@ SHOW CREATE TABLE t1; Table Create Table t1 CREATE TABLE `t1` ( `c1` int(11) NOT NULL, - `c2` timestamp NOT NULL DEFAULT current_timestamp() ON UPDATE current_timestamp(), + `c2` timestamp NOT NULL, `c4` mediumint(9) NOT NULL, - `c3` timestamp NOT NULL DEFAULT '0000-00-00 00:00:00', + `c3` timestamp NOT NULL, PRIMARY KEY (`c1`) ) ENGINE=ENGINE DEFAULT CHARSET=latin1 DROP TABLE t1; @@ -6447,8 +6447,8 @@ SHOW CREATE TABLE t1; Table Create Table t1 CREATE TABLE `t1` ( `c1` int(11) NOT NULL, - `c2` timestamp NOT NULL DEFAULT current_timestamp() ON UPDATE current_timestamp(), - `c3` timestamp NOT NULL DEFAULT '0000-00-00 00:00:00', + `c2` timestamp NOT NULL, + `c3` timestamp NOT NULL, PRIMARY KEY (`c1`) ) ENGINE=ENGINE DEFAULT CHARSET=latin1 ALTER TABLE t1 ADD c4 INT NOT NULL AFTER c2; @@ -6459,9 +6459,9 @@ SHOW CREATE TABLE t1; Table Create Table t1 CREATE TABLE `t1` ( `c1` int(11) NOT NULL, - `c2` timestamp NOT NULL DEFAULT current_timestamp() ON UPDATE current_timestamp(), + `c2` timestamp NOT NULL, `c4` int(11) NOT NULL, - `c3` timestamp NOT NULL DEFAULT '0000-00-00 00:00:00', + `c3` timestamp NOT NULL, PRIMARY KEY (`c1`) ) ENGINE=ENGINE DEFAULT CHARSET=latin1 DROP TABLE t1; @@ -7791,8 +7791,8 @@ SHOW CREATE TABLE t1; Table Create Table t1 CREATE TABLE `t1` ( `c1` int(11) NOT NULL, - `c2` timestamp NOT NULL DEFAULT current_timestamp() ON UPDATE current_timestamp(), - `c3` timestamp NOT NULL DEFAULT '0000-00-00 00:00:00', + `c2` timestamp NOT NULL, + `c3` timestamp NOT NULL, PRIMARY KEY (`c1`) ) ENGINE=ENGINE DEFAULT CHARSET=latin1 ALTER TABLE t1 ADD c4 INTEGER NOT NULL AFTER c2; @@ -7803,9 +7803,9 @@ SHOW CREATE TABLE t1; Table Create Table t1 CREATE TABLE `t1` ( `c1` int(11) NOT NULL, - `c2` timestamp NOT NULL DEFAULT current_timestamp() ON UPDATE current_timestamp(), + `c2` timestamp NOT NULL, `c4` int(11) NOT NULL, - `c3` timestamp NOT NULL DEFAULT '0000-00-00 00:00:00', + `c3` timestamp NOT NULL, PRIMARY KEY (`c1`) ) ENGINE=ENGINE DEFAULT CHARSET=latin1 DROP TABLE t1; @@ -9135,8 +9135,8 @@ SHOW CREATE TABLE t1; Table Create Table t1 CREATE TABLE `t1` ( `c1` int(11) NOT NULL, - `c2` timestamp NOT NULL DEFAULT current_timestamp() ON UPDATE current_timestamp(), - `c3` timestamp NOT NULL DEFAULT '0000-00-00 00:00:00', + `c2` timestamp NOT NULL, + `c3` timestamp NOT NULL, PRIMARY KEY (`c1`) ) ENGINE=ENGINE DEFAULT CHARSET=latin1 ALTER TABLE t1 ADD c4 BIGINT NOT NULL AFTER c2; @@ -9147,9 +9147,9 @@ SHOW CREATE TABLE t1; Table Create Table t1 CREATE TABLE `t1` ( `c1` int(11) NOT NULL, - `c2` timestamp NOT NULL DEFAULT current_timestamp() ON UPDATE current_timestamp(), + `c2` timestamp NOT NULL, `c4` bigint(20) NOT NULL, - `c3` timestamp NOT NULL DEFAULT '0000-00-00 00:00:00', + `c3` timestamp NOT NULL, PRIMARY KEY (`c1`) ) ENGINE=ENGINE DEFAULT CHARSET=latin1 DROP TABLE t1; @@ -10479,8 +10479,8 @@ SHOW CREATE TABLE t1; Table Create Table t1 CREATE TABLE `t1` ( `c1` int(11) NOT NULL, - `c2` timestamp NOT NULL DEFAULT current_timestamp() ON UPDATE current_timestamp(), - `c3` timestamp NOT NULL DEFAULT '0000-00-00 00:00:00', + `c2` timestamp NOT NULL, + `c3` timestamp NOT NULL, PRIMARY KEY (`c1`) ) ENGINE=ENGINE DEFAULT CHARSET=latin1 ALTER TABLE t1 ADD c4 REAL NOT NULL AFTER c2; @@ -10491,9 +10491,9 @@ SHOW CREATE TABLE t1; Table Create Table t1 CREATE TABLE `t1` ( `c1` int(11) NOT NULL, - `c2` timestamp NOT NULL DEFAULT current_timestamp() ON UPDATE current_timestamp(), + `c2` timestamp NOT NULL, `c4` double NOT NULL, - `c3` timestamp NOT NULL DEFAULT '0000-00-00 00:00:00', + `c3` timestamp NOT NULL, PRIMARY KEY (`c1`) ) ENGINE=ENGINE DEFAULT CHARSET=latin1 DROP TABLE t1; @@ -11823,8 +11823,8 @@ SHOW CREATE TABLE t1; Table Create Table t1 CREATE TABLE `t1` ( `c1` int(11) NOT NULL, - `c2` timestamp NOT NULL DEFAULT current_timestamp() ON UPDATE current_timestamp(), - `c3` timestamp NOT NULL DEFAULT '0000-00-00 00:00:00', + `c2` timestamp NOT NULL, + `c3` timestamp NOT NULL, PRIMARY KEY (`c1`) ) ENGINE=ENGINE DEFAULT CHARSET=latin1 ALTER TABLE t1 ADD c4 DOUBLE NOT NULL AFTER c2; @@ -11835,9 +11835,9 @@ SHOW CREATE TABLE t1; Table Create Table t1 CREATE TABLE `t1` ( `c1` int(11) NOT NULL, - `c2` timestamp NOT NULL DEFAULT current_timestamp() ON UPDATE current_timestamp(), + `c2` timestamp NOT NULL, `c4` double NOT NULL, - `c3` timestamp NOT NULL DEFAULT '0000-00-00 00:00:00', + `c3` timestamp NOT NULL, PRIMARY KEY (`c1`) ) ENGINE=ENGINE DEFAULT CHARSET=latin1 DROP TABLE t1; @@ -13167,8 +13167,8 @@ SHOW CREATE TABLE t1; Table Create Table t1 CREATE TABLE `t1` ( `c1` int(11) NOT NULL, - `c2` timestamp NOT NULL DEFAULT current_timestamp() ON UPDATE current_timestamp(), - `c3` timestamp NOT NULL DEFAULT '0000-00-00 00:00:00', + `c2` timestamp NOT NULL, + `c3` timestamp NOT NULL, PRIMARY KEY (`c1`) ) ENGINE=ENGINE DEFAULT CHARSET=latin1 ALTER TABLE t1 ADD c4 FLOAT NOT NULL AFTER c2; @@ -13179,9 +13179,9 @@ SHOW CREATE TABLE t1; Table Create Table t1 CREATE TABLE `t1` ( `c1` int(11) NOT NULL, - `c2` timestamp NOT NULL DEFAULT current_timestamp() ON UPDATE current_timestamp(), + `c2` timestamp NOT NULL, `c4` float NOT NULL, - `c3` timestamp NOT NULL DEFAULT '0000-00-00 00:00:00', + `c3` timestamp NOT NULL, PRIMARY KEY (`c1`) ) ENGINE=ENGINE DEFAULT CHARSET=latin1 DROP TABLE t1; @@ -14511,8 +14511,8 @@ SHOW CREATE TABLE t1; Table Create Table t1 CREATE TABLE `t1` ( `c1` int(11) NOT NULL, - `c2` timestamp NOT NULL DEFAULT current_timestamp() ON UPDATE current_timestamp(), - `c3` timestamp NOT NULL DEFAULT '0000-00-00 00:00:00', + `c2` timestamp NOT NULL, + `c3` timestamp NOT NULL, PRIMARY KEY (`c1`) ) ENGINE=ENGINE DEFAULT CHARSET=latin1 ALTER TABLE t1 ADD c4 DECIMAL NOT NULL AFTER c2; @@ -14523,9 +14523,9 @@ SHOW CREATE TABLE t1; Table Create Table t1 CREATE TABLE `t1` ( `c1` int(11) NOT NULL, - `c2` timestamp NOT NULL DEFAULT current_timestamp() ON UPDATE current_timestamp(), + `c2` timestamp NOT NULL, `c4` decimal(10,0) NOT NULL, - `c3` timestamp NOT NULL DEFAULT '0000-00-00 00:00:00', + `c3` timestamp NOT NULL, PRIMARY KEY (`c1`) ) ENGINE=ENGINE DEFAULT CHARSET=latin1 DROP TABLE t1; @@ -15855,8 +15855,8 @@ SHOW CREATE TABLE t1; Table Create Table t1 CREATE TABLE `t1` ( `c1` int(11) NOT NULL, - `c2` timestamp NOT NULL DEFAULT current_timestamp() ON UPDATE current_timestamp(), - `c3` timestamp NOT NULL DEFAULT '0000-00-00 00:00:00', + `c2` timestamp NOT NULL, + `c3` timestamp NOT NULL, PRIMARY KEY (`c1`) ) ENGINE=ENGINE DEFAULT CHARSET=latin1 ALTER TABLE t1 ADD c4 NUMERIC NOT NULL AFTER c2; @@ -15867,9 +15867,9 @@ SHOW CREATE TABLE t1; Table Create Table t1 CREATE TABLE `t1` ( `c1` int(11) NOT NULL, - `c2` timestamp NOT NULL DEFAULT current_timestamp() ON UPDATE current_timestamp(), + `c2` timestamp NOT NULL, `c4` decimal(10,0) NOT NULL, - `c3` timestamp NOT NULL DEFAULT '0000-00-00 00:00:00', + `c3` timestamp NOT NULL, PRIMARY KEY (`c1`) ) ENGINE=ENGINE DEFAULT CHARSET=latin1 DROP TABLE t1; @@ -17199,8 +17199,8 @@ SHOW CREATE TABLE t1; Table Create Table t1 CREATE TABLE `t1` ( `c1` int(11) NOT NULL, - `c2` timestamp NOT NULL DEFAULT current_timestamp() ON UPDATE current_timestamp(), - `c3` timestamp NOT NULL DEFAULT '0000-00-00 00:00:00', + `c2` timestamp NOT NULL, + `c3` timestamp NOT NULL, PRIMARY KEY (`c1`) ) ENGINE=ENGINE DEFAULT CHARSET=latin1 ALTER TABLE t1 ADD c4 DATE NOT NULL AFTER c2; @@ -17211,9 +17211,9 @@ SHOW CREATE TABLE t1; Table Create Table t1 CREATE TABLE `t1` ( `c1` int(11) NOT NULL, - `c2` timestamp NOT NULL DEFAULT current_timestamp() ON UPDATE current_timestamp(), + `c2` timestamp NOT NULL, `c4` date NOT NULL, - `c3` timestamp NOT NULL DEFAULT '0000-00-00 00:00:00', + `c3` timestamp NOT NULL, PRIMARY KEY (`c1`) ) ENGINE=ENGINE DEFAULT CHARSET=latin1 DROP TABLE t1; @@ -18543,8 +18543,8 @@ SHOW CREATE TABLE t1; Table Create Table t1 CREATE TABLE `t1` ( `c1` int(11) NOT NULL, - `c2` timestamp NOT NULL DEFAULT current_timestamp() ON UPDATE current_timestamp(), - `c3` timestamp NOT NULL DEFAULT '0000-00-00 00:00:00', + `c2` timestamp NOT NULL, + `c3` timestamp NOT NULL, PRIMARY KEY (`c1`) ) ENGINE=ENGINE DEFAULT CHARSET=latin1 ALTER TABLE t1 ADD c4 TIME NOT NULL AFTER c2; @@ -18555,9 +18555,9 @@ SHOW CREATE TABLE t1; Table Create Table t1 CREATE TABLE `t1` ( `c1` int(11) NOT NULL, - `c2` timestamp NOT NULL DEFAULT current_timestamp() ON UPDATE current_timestamp(), + `c2` timestamp NOT NULL, `c4` time NOT NULL, - `c3` timestamp NOT NULL DEFAULT '0000-00-00 00:00:00', + `c3` timestamp NOT NULL, PRIMARY KEY (`c1`) ) ENGINE=ENGINE DEFAULT CHARSET=latin1 DROP TABLE t1; @@ -19508,7 +19508,7 @@ Table Create Table t1 CREATE TABLE `t1` ( `c1` int(11) NOT NULL, `c2` bit(1) NOT NULL, - `c4` timestamp NOT NULL DEFAULT current_timestamp() ON UPDATE current_timestamp(), + `c4` timestamp NOT NULL, `c3` bit(1) NOT NULL, PRIMARY KEY (`c1`) ) ENGINE=ENGINE DEFAULT CHARSET=latin1 @@ -19536,7 +19536,7 @@ Table Create Table t1 CREATE TABLE `t1` ( `c1` int(11) NOT NULL, `c2` tinyint(4) NOT NULL, - `c4` timestamp NOT NULL DEFAULT current_timestamp() ON UPDATE current_timestamp(), + `c4` timestamp NOT NULL, `c3` tinyint(4) NOT NULL, PRIMARY KEY (`c1`) ) ENGINE=ENGINE DEFAULT CHARSET=latin1 @@ -19564,7 +19564,7 @@ Table Create Table t1 CREATE TABLE `t1` ( `c1` int(11) NOT NULL, `c2` smallint(6) NOT NULL, - `c4` timestamp NOT NULL DEFAULT current_timestamp() ON UPDATE current_timestamp(), + `c4` timestamp NOT NULL, `c3` smallint(6) NOT NULL, PRIMARY KEY (`c1`) ) ENGINE=ENGINE DEFAULT CHARSET=latin1 @@ -19592,7 +19592,7 @@ Table Create Table t1 CREATE TABLE `t1` ( `c1` int(11) NOT NULL, `c2` mediumint(9) NOT NULL, - `c4` timestamp NOT NULL DEFAULT current_timestamp() ON UPDATE current_timestamp(), + `c4` timestamp NOT NULL, `c3` mediumint(9) NOT NULL, PRIMARY KEY (`c1`) ) ENGINE=ENGINE DEFAULT CHARSET=latin1 @@ -19620,7 +19620,7 @@ Table Create Table t1 CREATE TABLE `t1` ( `c1` int(11) NOT NULL, `c2` int(11) NOT NULL, - `c4` timestamp NOT NULL DEFAULT current_timestamp() ON UPDATE current_timestamp(), + `c4` timestamp NOT NULL, `c3` int(11) NOT NULL, PRIMARY KEY (`c1`) ) ENGINE=ENGINE DEFAULT CHARSET=latin1 @@ -19648,7 +19648,7 @@ Table Create Table t1 CREATE TABLE `t1` ( `c1` int(11) NOT NULL, `c2` int(11) NOT NULL, - `c4` timestamp NOT NULL DEFAULT current_timestamp() ON UPDATE current_timestamp(), + `c4` timestamp NOT NULL, `c3` int(11) NOT NULL, PRIMARY KEY (`c1`) ) ENGINE=ENGINE DEFAULT CHARSET=latin1 @@ -19676,7 +19676,7 @@ Table Create Table t1 CREATE TABLE `t1` ( `c1` int(11) NOT NULL, `c2` bigint(20) NOT NULL, - `c4` timestamp NOT NULL DEFAULT current_timestamp() ON UPDATE current_timestamp(), + `c4` timestamp NOT NULL, `c3` bigint(20) NOT NULL, PRIMARY KEY (`c1`) ) ENGINE=ENGINE DEFAULT CHARSET=latin1 @@ -19704,7 +19704,7 @@ Table Create Table t1 CREATE TABLE `t1` ( `c1` int(11) NOT NULL, `c2` double NOT NULL, - `c4` timestamp NOT NULL DEFAULT current_timestamp() ON UPDATE current_timestamp(), + `c4` timestamp NOT NULL, `c3` double NOT NULL, PRIMARY KEY (`c1`) ) ENGINE=ENGINE DEFAULT CHARSET=latin1 @@ -19732,7 +19732,7 @@ Table Create Table t1 CREATE TABLE `t1` ( `c1` int(11) NOT NULL, `c2` double NOT NULL, - `c4` timestamp NOT NULL DEFAULT current_timestamp() ON UPDATE current_timestamp(), + `c4` timestamp NOT NULL, `c3` double NOT NULL, PRIMARY KEY (`c1`) ) ENGINE=ENGINE DEFAULT CHARSET=latin1 @@ -19760,7 +19760,7 @@ Table Create Table t1 CREATE TABLE `t1` ( `c1` int(11) NOT NULL, `c2` float NOT NULL, - `c4` timestamp NOT NULL DEFAULT current_timestamp() ON UPDATE current_timestamp(), + `c4` timestamp NOT NULL, `c3` float NOT NULL, PRIMARY KEY (`c1`) ) ENGINE=ENGINE DEFAULT CHARSET=latin1 @@ -19788,7 +19788,7 @@ Table Create Table t1 CREATE TABLE `t1` ( `c1` int(11) NOT NULL, `c2` decimal(10,0) NOT NULL, - `c4` timestamp NOT NULL DEFAULT current_timestamp() ON UPDATE current_timestamp(), + `c4` timestamp NOT NULL, `c3` decimal(10,0) NOT NULL, PRIMARY KEY (`c1`) ) ENGINE=ENGINE DEFAULT CHARSET=latin1 @@ -19816,7 +19816,7 @@ Table Create Table t1 CREATE TABLE `t1` ( `c1` int(11) NOT NULL, `c2` decimal(10,0) NOT NULL, - `c4` timestamp NOT NULL DEFAULT current_timestamp() ON UPDATE current_timestamp(), + `c4` timestamp NOT NULL, `c3` decimal(10,0) NOT NULL, PRIMARY KEY (`c1`) ) ENGINE=ENGINE DEFAULT CHARSET=latin1 @@ -19844,7 +19844,7 @@ Table Create Table t1 CREATE TABLE `t1` ( `c1` int(11) NOT NULL, `c2` date NOT NULL, - `c4` timestamp NOT NULL DEFAULT current_timestamp() ON UPDATE current_timestamp(), + `c4` timestamp NOT NULL, `c3` date NOT NULL, PRIMARY KEY (`c1`) ) ENGINE=ENGINE DEFAULT CHARSET=latin1 @@ -19872,7 +19872,7 @@ Table Create Table t1 CREATE TABLE `t1` ( `c1` int(11) NOT NULL, `c2` time NOT NULL, - `c4` timestamp NOT NULL DEFAULT current_timestamp() ON UPDATE current_timestamp(), + `c4` timestamp NOT NULL, `c3` time NOT NULL, PRIMARY KEY (`c1`) ) ENGINE=ENGINE DEFAULT CHARSET=latin1 @@ -19887,8 +19887,8 @@ SHOW CREATE TABLE t1; Table Create Table t1 CREATE TABLE `t1` ( `c1` int(11) NOT NULL, - `c2` timestamp NOT NULL DEFAULT current_timestamp() ON UPDATE current_timestamp(), - `c3` timestamp NOT NULL DEFAULT '0000-00-00 00:00:00', + `c2` timestamp NOT NULL, + `c3` timestamp NOT NULL, PRIMARY KEY (`c1`) ) ENGINE=ENGINE DEFAULT CHARSET=latin1 ALTER TABLE t1 ADD c4 TIMESTAMP NOT NULL AFTER c2; @@ -19899,9 +19899,9 @@ SHOW CREATE TABLE t1; Table Create Table t1 CREATE TABLE `t1` ( `c1` int(11) NOT NULL, - `c2` timestamp NOT NULL DEFAULT current_timestamp() ON UPDATE current_timestamp(), - `c4` timestamp NOT NULL DEFAULT '0000-00-00 00:00:00', - `c3` timestamp NOT NULL DEFAULT '0000-00-00 00:00:00', + `c2` timestamp NOT NULL, + `c4` timestamp NOT NULL, + `c3` timestamp NOT NULL, PRIMARY KEY (`c1`) ) ENGINE=ENGINE DEFAULT CHARSET=latin1 DROP TABLE t1; @@ -19928,7 +19928,7 @@ Table Create Table t1 CREATE TABLE `t1` ( `c1` int(11) NOT NULL, `c2` year(4) NOT NULL, - `c4` timestamp NOT NULL DEFAULT current_timestamp() ON UPDATE current_timestamp(), + `c4` timestamp NOT NULL, `c3` year(4) NOT NULL, PRIMARY KEY (`c1`) ) ENGINE=ENGINE DEFAULT CHARSET=latin1 @@ -19956,7 +19956,7 @@ Table Create Table t1 CREATE TABLE `t1` ( `c1` int(11) NOT NULL, `c2` tinyblob NOT NULL, - `c4` timestamp NOT NULL DEFAULT current_timestamp() ON UPDATE current_timestamp(), + `c4` timestamp NOT NULL, `c3` tinyblob NOT NULL, PRIMARY KEY (`c1`) ) ENGINE=ENGINE DEFAULT CHARSET=latin1 @@ -19984,7 +19984,7 @@ Table Create Table t1 CREATE TABLE `t1` ( `c1` int(11) NOT NULL, `c2` blob NOT NULL, - `c4` timestamp NOT NULL DEFAULT current_timestamp() ON UPDATE current_timestamp(), + `c4` timestamp NOT NULL, `c3` blob NOT NULL, PRIMARY KEY (`c1`) ) ENGINE=ENGINE DEFAULT CHARSET=latin1 @@ -20012,7 +20012,7 @@ Table Create Table t1 CREATE TABLE `t1` ( `c1` int(11) NOT NULL, `c2` mediumblob NOT NULL, - `c4` timestamp NOT NULL DEFAULT current_timestamp() ON UPDATE current_timestamp(), + `c4` timestamp NOT NULL, `c3` mediumblob NOT NULL, PRIMARY KEY (`c1`) ) ENGINE=ENGINE DEFAULT CHARSET=latin1 @@ -20040,7 +20040,7 @@ Table Create Table t1 CREATE TABLE `t1` ( `c1` int(11) NOT NULL, `c2` longblob NOT NULL, - `c4` timestamp NOT NULL DEFAULT current_timestamp() ON UPDATE current_timestamp(), + `c4` timestamp NOT NULL, `c3` longblob NOT NULL, PRIMARY KEY (`c1`) ) ENGINE=ENGINE DEFAULT CHARSET=latin1 @@ -20068,7 +20068,7 @@ Table Create Table t1 CREATE TABLE `t1` ( `c1` int(11) NOT NULL, `c2` tinytext NOT NULL, - `c4` timestamp NOT NULL DEFAULT current_timestamp() ON UPDATE current_timestamp(), + `c4` timestamp NOT NULL, `c3` tinytext NOT NULL, PRIMARY KEY (`c1`) ) ENGINE=ENGINE DEFAULT CHARSET=latin1 @@ -20096,7 +20096,7 @@ Table Create Table t1 CREATE TABLE `t1` ( `c1` int(11) NOT NULL, `c2` text NOT NULL, - `c4` timestamp NOT NULL DEFAULT current_timestamp() ON UPDATE current_timestamp(), + `c4` timestamp NOT NULL, `c3` text NOT NULL, PRIMARY KEY (`c1`) ) ENGINE=ENGINE DEFAULT CHARSET=latin1 @@ -20124,7 +20124,7 @@ Table Create Table t1 CREATE TABLE `t1` ( `c1` int(11) NOT NULL, `c2` mediumtext NOT NULL, - `c4` timestamp NOT NULL DEFAULT current_timestamp() ON UPDATE current_timestamp(), + `c4` timestamp NOT NULL, `c3` mediumtext NOT NULL, PRIMARY KEY (`c1`) ) ENGINE=ENGINE DEFAULT CHARSET=latin1 @@ -20152,7 +20152,7 @@ Table Create Table t1 CREATE TABLE `t1` ( `c1` int(11) NOT NULL, `c2` longtext NOT NULL, - `c4` timestamp NOT NULL DEFAULT current_timestamp() ON UPDATE current_timestamp(), + `c4` timestamp NOT NULL, `c3` longtext NOT NULL, PRIMARY KEY (`c1`) ) ENGINE=ENGINE DEFAULT CHARSET=latin1 @@ -21231,8 +21231,8 @@ SHOW CREATE TABLE t1; Table Create Table t1 CREATE TABLE `t1` ( `c1` int(11) NOT NULL, - `c2` timestamp NOT NULL DEFAULT current_timestamp() ON UPDATE current_timestamp(), - `c3` timestamp NOT NULL DEFAULT '0000-00-00 00:00:00', + `c2` timestamp NOT NULL, + `c3` timestamp NOT NULL, PRIMARY KEY (`c1`) ) ENGINE=ENGINE DEFAULT CHARSET=latin1 ALTER TABLE t1 ADD c4 YEAR NOT NULL AFTER c2; @@ -21243,9 +21243,9 @@ SHOW CREATE TABLE t1; Table Create Table t1 CREATE TABLE `t1` ( `c1` int(11) NOT NULL, - `c2` timestamp NOT NULL DEFAULT current_timestamp() ON UPDATE current_timestamp(), + `c2` timestamp NOT NULL, `c4` year(4) NOT NULL, - `c3` timestamp NOT NULL DEFAULT '0000-00-00 00:00:00', + `c3` timestamp NOT NULL, PRIMARY KEY (`c1`) ) ENGINE=ENGINE DEFAULT CHARSET=latin1 DROP TABLE t1; @@ -22575,8 +22575,8 @@ SHOW CREATE TABLE t1; Table Create Table t1 CREATE TABLE `t1` ( `c1` int(11) NOT NULL, - `c2` timestamp NOT NULL DEFAULT current_timestamp() ON UPDATE current_timestamp(), - `c3` timestamp NOT NULL DEFAULT '0000-00-00 00:00:00', + `c2` timestamp NOT NULL, + `c3` timestamp NOT NULL, PRIMARY KEY (`c1`) ) ENGINE=ENGINE DEFAULT CHARSET=latin1 ALTER TABLE t1 ADD c4 TINYBLOB NOT NULL AFTER c2; @@ -22587,9 +22587,9 @@ SHOW CREATE TABLE t1; Table Create Table t1 CREATE TABLE `t1` ( `c1` int(11) NOT NULL, - `c2` timestamp NOT NULL DEFAULT current_timestamp() ON UPDATE current_timestamp(), + `c2` timestamp NOT NULL, `c4` tinyblob NOT NULL, - `c3` timestamp NOT NULL DEFAULT '0000-00-00 00:00:00', + `c3` timestamp NOT NULL, PRIMARY KEY (`c1`) ) ENGINE=ENGINE DEFAULT CHARSET=latin1 DROP TABLE t1; @@ -23919,8 +23919,8 @@ SHOW CREATE TABLE t1; Table Create Table t1 CREATE TABLE `t1` ( `c1` int(11) NOT NULL, - `c2` timestamp NOT NULL DEFAULT current_timestamp() ON UPDATE current_timestamp(), - `c3` timestamp NOT NULL DEFAULT '0000-00-00 00:00:00', + `c2` timestamp NOT NULL, + `c3` timestamp NOT NULL, PRIMARY KEY (`c1`) ) ENGINE=ENGINE DEFAULT CHARSET=latin1 ALTER TABLE t1 ADD c4 BLOB NOT NULL AFTER c2; @@ -23931,9 +23931,9 @@ SHOW CREATE TABLE t1; Table Create Table t1 CREATE TABLE `t1` ( `c1` int(11) NOT NULL, - `c2` timestamp NOT NULL DEFAULT current_timestamp() ON UPDATE current_timestamp(), + `c2` timestamp NOT NULL, `c4` blob NOT NULL, - `c3` timestamp NOT NULL DEFAULT '0000-00-00 00:00:00', + `c3` timestamp NOT NULL, PRIMARY KEY (`c1`) ) ENGINE=ENGINE DEFAULT CHARSET=latin1 DROP TABLE t1; @@ -25263,8 +25263,8 @@ SHOW CREATE TABLE t1; Table Create Table t1 CREATE TABLE `t1` ( `c1` int(11) NOT NULL, - `c2` timestamp NOT NULL DEFAULT current_timestamp() ON UPDATE current_timestamp(), - `c3` timestamp NOT NULL DEFAULT '0000-00-00 00:00:00', + `c2` timestamp NOT NULL, + `c3` timestamp NOT NULL, PRIMARY KEY (`c1`) ) ENGINE=ENGINE DEFAULT CHARSET=latin1 ALTER TABLE t1 ADD c4 MEDIUMBLOB NOT NULL AFTER c2; @@ -25275,9 +25275,9 @@ SHOW CREATE TABLE t1; Table Create Table t1 CREATE TABLE `t1` ( `c1` int(11) NOT NULL, - `c2` timestamp NOT NULL DEFAULT current_timestamp() ON UPDATE current_timestamp(), + `c2` timestamp NOT NULL, `c4` mediumblob NOT NULL, - `c3` timestamp NOT NULL DEFAULT '0000-00-00 00:00:00', + `c3` timestamp NOT NULL, PRIMARY KEY (`c1`) ) ENGINE=ENGINE DEFAULT CHARSET=latin1 DROP TABLE t1; @@ -26607,8 +26607,8 @@ SHOW CREATE TABLE t1; Table Create Table t1 CREATE TABLE `t1` ( `c1` int(11) NOT NULL, - `c2` timestamp NOT NULL DEFAULT current_timestamp() ON UPDATE current_timestamp(), - `c3` timestamp NOT NULL DEFAULT '0000-00-00 00:00:00', + `c2` timestamp NOT NULL, + `c3` timestamp NOT NULL, PRIMARY KEY (`c1`) ) ENGINE=ENGINE DEFAULT CHARSET=latin1 ALTER TABLE t1 ADD c4 LONGBLOB NOT NULL AFTER c2; @@ -26619,9 +26619,9 @@ SHOW CREATE TABLE t1; Table Create Table t1 CREATE TABLE `t1` ( `c1` int(11) NOT NULL, - `c2` timestamp NOT NULL DEFAULT current_timestamp() ON UPDATE current_timestamp(), + `c2` timestamp NOT NULL, `c4` longblob NOT NULL, - `c3` timestamp NOT NULL DEFAULT '0000-00-00 00:00:00', + `c3` timestamp NOT NULL, PRIMARY KEY (`c1`) ) ENGINE=ENGINE DEFAULT CHARSET=latin1 DROP TABLE t1; @@ -27951,8 +27951,8 @@ SHOW CREATE TABLE t1; Table Create Table t1 CREATE TABLE `t1` ( `c1` int(11) NOT NULL, - `c2` timestamp NOT NULL DEFAULT current_timestamp() ON UPDATE current_timestamp(), - `c3` timestamp NOT NULL DEFAULT '0000-00-00 00:00:00', + `c2` timestamp NOT NULL, + `c3` timestamp NOT NULL, PRIMARY KEY (`c1`) ) ENGINE=ENGINE DEFAULT CHARSET=latin1 ALTER TABLE t1 ADD c4 TINYTEXT NOT NULL AFTER c2; @@ -27963,9 +27963,9 @@ SHOW CREATE TABLE t1; Table Create Table t1 CREATE TABLE `t1` ( `c1` int(11) NOT NULL, - `c2` timestamp NOT NULL DEFAULT current_timestamp() ON UPDATE current_timestamp(), + `c2` timestamp NOT NULL, `c4` tinytext NOT NULL, - `c3` timestamp NOT NULL DEFAULT '0000-00-00 00:00:00', + `c3` timestamp NOT NULL, PRIMARY KEY (`c1`) ) ENGINE=ENGINE DEFAULT CHARSET=latin1 DROP TABLE t1; @@ -29295,8 +29295,8 @@ SHOW CREATE TABLE t1; Table Create Table t1 CREATE TABLE `t1` ( `c1` int(11) NOT NULL, - `c2` timestamp NOT NULL DEFAULT current_timestamp() ON UPDATE current_timestamp(), - `c3` timestamp NOT NULL DEFAULT '0000-00-00 00:00:00', + `c2` timestamp NOT NULL, + `c3` timestamp NOT NULL, PRIMARY KEY (`c1`) ) ENGINE=ENGINE DEFAULT CHARSET=latin1 ALTER TABLE t1 ADD c4 TEXT NOT NULL AFTER c2; @@ -29307,9 +29307,9 @@ SHOW CREATE TABLE t1; Table Create Table t1 CREATE TABLE `t1` ( `c1` int(11) NOT NULL, - `c2` timestamp NOT NULL DEFAULT current_timestamp() ON UPDATE current_timestamp(), + `c2` timestamp NOT NULL, `c4` text NOT NULL, - `c3` timestamp NOT NULL DEFAULT '0000-00-00 00:00:00', + `c3` timestamp NOT NULL, PRIMARY KEY (`c1`) ) ENGINE=ENGINE DEFAULT CHARSET=latin1 DROP TABLE t1; @@ -30639,8 +30639,8 @@ SHOW CREATE TABLE t1; Table Create Table t1 CREATE TABLE `t1` ( `c1` int(11) NOT NULL, - `c2` timestamp NOT NULL DEFAULT current_timestamp() ON UPDATE current_timestamp(), - `c3` timestamp NOT NULL DEFAULT '0000-00-00 00:00:00', + `c2` timestamp NOT NULL, + `c3` timestamp NOT NULL, PRIMARY KEY (`c1`) ) ENGINE=ENGINE DEFAULT CHARSET=latin1 ALTER TABLE t1 ADD c4 MEDIUMTEXT NOT NULL AFTER c2; @@ -30651,9 +30651,9 @@ SHOW CREATE TABLE t1; Table Create Table t1 CREATE TABLE `t1` ( `c1` int(11) NOT NULL, - `c2` timestamp NOT NULL DEFAULT current_timestamp() ON UPDATE current_timestamp(), + `c2` timestamp NOT NULL, `c4` mediumtext NOT NULL, - `c3` timestamp NOT NULL DEFAULT '0000-00-00 00:00:00', + `c3` timestamp NOT NULL, PRIMARY KEY (`c1`) ) ENGINE=ENGINE DEFAULT CHARSET=latin1 DROP TABLE t1; @@ -31983,8 +31983,8 @@ SHOW CREATE TABLE t1; Table Create Table t1 CREATE TABLE `t1` ( `c1` int(11) NOT NULL, - `c2` timestamp NOT NULL DEFAULT current_timestamp() ON UPDATE current_timestamp(), - `c3` timestamp NOT NULL DEFAULT '0000-00-00 00:00:00', + `c2` timestamp NOT NULL, + `c3` timestamp NOT NULL, PRIMARY KEY (`c1`) ) ENGINE=ENGINE DEFAULT CHARSET=latin1 ALTER TABLE t1 ADD c4 LONGTEXT NOT NULL AFTER c2; @@ -31995,9 +31995,9 @@ SHOW CREATE TABLE t1; Table Create Table t1 CREATE TABLE `t1` ( `c1` int(11) NOT NULL, - `c2` timestamp NOT NULL DEFAULT current_timestamp() ON UPDATE current_timestamp(), + `c2` timestamp NOT NULL, `c4` longtext NOT NULL, - `c3` timestamp NOT NULL DEFAULT '0000-00-00 00:00:00', + `c3` timestamp NOT NULL, PRIMARY KEY (`c1`) ) ENGINE=ENGINE DEFAULT CHARSET=latin1 DROP TABLE t1; diff --git a/mysql-test/suite/engines/funcs/r/ta_add_column_middle2.result b/mysql-test/suite/engines/funcs/r/ta_add_column_middle2.result index 3b903781d91..8e7991f80d7 100644 --- a/mysql-test/suite/engines/funcs/r/ta_add_column_middle2.result +++ b/mysql-test/suite/engines/funcs/r/ta_add_column_middle2.result @@ -3268,7 +3268,7 @@ Table Create Table t1 CREATE TABLE `t1` ( `c1` char(15) NOT NULL, `c2` int(11) NOT NULL, - `c4` timestamp NOT NULL DEFAULT current_timestamp() ON UPDATE current_timestamp(), + `c4` timestamp NOT NULL, `c3` char(20) NOT NULL, PRIMARY KEY (`c1`) ) ENGINE=ENGINE DEFAULT CHARSET=latin1 @@ -3296,7 +3296,7 @@ Table Create Table t1 CREATE TABLE `t1` ( `c1` varchar(15) NOT NULL, `c2` int(11) NOT NULL, - `c4` timestamp NOT NULL DEFAULT current_timestamp() ON UPDATE current_timestamp(), + `c4` timestamp NOT NULL, `c3` varchar(20) NOT NULL, PRIMARY KEY (`c1`) ) ENGINE=ENGINE DEFAULT CHARSET=latin1 @@ -3324,7 +3324,7 @@ Table Create Table t1 CREATE TABLE `t1` ( `c1` binary(15) NOT NULL, `c2` int(11) NOT NULL, - `c4` timestamp NOT NULL DEFAULT current_timestamp() ON UPDATE current_timestamp(), + `c4` timestamp NOT NULL, `c3` binary(20) NOT NULL, PRIMARY KEY (`c1`) ) ENGINE=ENGINE DEFAULT CHARSET=latin1 @@ -3352,7 +3352,7 @@ Table Create Table t1 CREATE TABLE `t1` ( `c1` varbinary(15) NOT NULL, `c2` int(11) NOT NULL, - `c4` timestamp NOT NULL DEFAULT current_timestamp() ON UPDATE current_timestamp(), + `c4` timestamp NOT NULL, `c3` varbinary(20) NOT NULL, PRIMARY KEY (`c1`) ) ENGINE=ENGINE DEFAULT CHARSET=latin1 diff --git a/mysql-test/suite/engines/funcs/r/ta_add_string2.result b/mysql-test/suite/engines/funcs/r/ta_add_string2.result index d17f66523f7..ea9f9887481 100644 --- a/mysql-test/suite/engines/funcs/r/ta_add_string2.result +++ b/mysql-test/suite/engines/funcs/r/ta_add_string2.result @@ -842,7 +842,7 @@ t5 SHOW CREATE TABLE t5; Table Create Table t5 CREATE TABLE `t5` ( - `c1` timestamp NOT NULL DEFAULT current_timestamp() ON UPDATE current_timestamp() + `c1` timestamp NOT NULL ) ENGINE=ENGINE DEFAULT CHARSET=latin1 ALTER TABLE t5 ADD c2 CHAR(5) NOT NULL; SHOW TABLES; @@ -851,7 +851,7 @@ t5 SHOW CREATE TABLE t5; Table Create Table t5 CREATE TABLE `t5` ( - `c1` timestamp NOT NULL DEFAULT current_timestamp() ON UPDATE current_timestamp(), + `c1` timestamp NOT NULL, `c2` char(5) NOT NULL ) ENGINE=ENGINE DEFAULT CHARSET=latin1 DROP TABLE t5; @@ -1898,7 +1898,7 @@ t5 SHOW CREATE TABLE t5; Table Create Table t5 CREATE TABLE `t5` ( - `c1` timestamp NOT NULL DEFAULT current_timestamp() ON UPDATE current_timestamp() + `c1` timestamp NOT NULL ) ENGINE=ENGINE DEFAULT CHARSET=latin1 ALTER TABLE t5 ADD c2 VARCHAR(5) NOT NULL; SHOW TABLES; @@ -1907,7 +1907,7 @@ t5 SHOW CREATE TABLE t5; Table Create Table t5 CREATE TABLE `t5` ( - `c1` timestamp NOT NULL DEFAULT current_timestamp() ON UPDATE current_timestamp(), + `c1` timestamp NOT NULL, `c2` varchar(5) NOT NULL ) ENGINE=ENGINE DEFAULT CHARSET=latin1 DROP TABLE t5; @@ -2954,7 +2954,7 @@ t5 SHOW CREATE TABLE t5; Table Create Table t5 CREATE TABLE `t5` ( - `c1` timestamp NOT NULL DEFAULT current_timestamp() ON UPDATE current_timestamp() + `c1` timestamp NOT NULL ) ENGINE=ENGINE DEFAULT CHARSET=latin1 ALTER TABLE t5 ADD c2 BINARY(5) NOT NULL; SHOW TABLES; @@ -2963,7 +2963,7 @@ t5 SHOW CREATE TABLE t5; Table Create Table t5 CREATE TABLE `t5` ( - `c1` timestamp NOT NULL DEFAULT current_timestamp() ON UPDATE current_timestamp(), + `c1` timestamp NOT NULL, `c2` binary(5) NOT NULL ) ENGINE=ENGINE DEFAULT CHARSET=latin1 DROP TABLE t5; @@ -4010,7 +4010,7 @@ t5 SHOW CREATE TABLE t5; Table Create Table t5 CREATE TABLE `t5` ( - `c1` timestamp NOT NULL DEFAULT current_timestamp() ON UPDATE current_timestamp() + `c1` timestamp NOT NULL ) ENGINE=ENGINE DEFAULT CHARSET=latin1 ALTER TABLE t5 ADD c2 VARBINARY(5) NOT NULL; SHOW TABLES; @@ -4019,7 +4019,7 @@ t5 SHOW CREATE TABLE t5; Table Create Table t5 CREATE TABLE `t5` ( - `c1` timestamp NOT NULL DEFAULT current_timestamp() ON UPDATE current_timestamp(), + `c1` timestamp NOT NULL, `c2` varbinary(5) NOT NULL ) ENGINE=ENGINE DEFAULT CHARSET=latin1 DROP TABLE t5; diff --git a/mysql-test/suite/engines/funcs/r/ta_add_string_first2.result b/mysql-test/suite/engines/funcs/r/ta_add_string_first2.result index 6298df8d18d..a15b6db7925 100644 --- a/mysql-test/suite/engines/funcs/r/ta_add_string_first2.result +++ b/mysql-test/suite/engines/funcs/r/ta_add_string_first2.result @@ -842,7 +842,7 @@ t5 SHOW CREATE TABLE t5; Table Create Table t5 CREATE TABLE `t5` ( - `c1` timestamp NOT NULL DEFAULT current_timestamp() ON UPDATE current_timestamp() + `c1` timestamp NOT NULL ) ENGINE=ENGINE DEFAULT CHARSET=latin1 ALTER TABLE t5 ADD c2 CHAR(5) NOT NULL FIRST; SHOW TABLES; @@ -852,7 +852,7 @@ SHOW CREATE TABLE t5; Table Create Table t5 CREATE TABLE `t5` ( `c2` char(5) NOT NULL, - `c1` timestamp NOT NULL DEFAULT current_timestamp() ON UPDATE current_timestamp() + `c1` timestamp NOT NULL ) ENGINE=ENGINE DEFAULT CHARSET=latin1 DROP TABLE t5; SHOW TABLES; @@ -1898,7 +1898,7 @@ t5 SHOW CREATE TABLE t5; Table Create Table t5 CREATE TABLE `t5` ( - `c1` timestamp NOT NULL DEFAULT current_timestamp() ON UPDATE current_timestamp() + `c1` timestamp NOT NULL ) ENGINE=ENGINE DEFAULT CHARSET=latin1 ALTER TABLE t5 ADD c2 VARCHAR(5) NOT NULL FIRST; SHOW TABLES; @@ -1908,7 +1908,7 @@ SHOW CREATE TABLE t5; Table Create Table t5 CREATE TABLE `t5` ( `c2` varchar(5) NOT NULL, - `c1` timestamp NOT NULL DEFAULT current_timestamp() ON UPDATE current_timestamp() + `c1` timestamp NOT NULL ) ENGINE=ENGINE DEFAULT CHARSET=latin1 DROP TABLE t5; SHOW TABLES; @@ -2954,7 +2954,7 @@ t5 SHOW CREATE TABLE t5; Table Create Table t5 CREATE TABLE `t5` ( - `c1` timestamp NOT NULL DEFAULT current_timestamp() ON UPDATE current_timestamp() + `c1` timestamp NOT NULL ) ENGINE=ENGINE DEFAULT CHARSET=latin1 ALTER TABLE t5 ADD c2 BINARY(5) NOT NULL FIRST; SHOW TABLES; @@ -2964,7 +2964,7 @@ SHOW CREATE TABLE t5; Table Create Table t5 CREATE TABLE `t5` ( `c2` binary(5) NOT NULL, - `c1` timestamp NOT NULL DEFAULT current_timestamp() ON UPDATE current_timestamp() + `c1` timestamp NOT NULL ) ENGINE=ENGINE DEFAULT CHARSET=latin1 DROP TABLE t5; SHOW TABLES; @@ -4010,7 +4010,7 @@ t5 SHOW CREATE TABLE t5; Table Create Table t5 CREATE TABLE `t5` ( - `c1` timestamp NOT NULL DEFAULT current_timestamp() ON UPDATE current_timestamp() + `c1` timestamp NOT NULL ) ENGINE=ENGINE DEFAULT CHARSET=latin1 ALTER TABLE t5 ADD c2 VARBINARY(5) NOT NULL FIRST; SHOW TABLES; @@ -4020,7 +4020,7 @@ SHOW CREATE TABLE t5; Table Create Table t5 CREATE TABLE `t5` ( `c2` varbinary(5) NOT NULL, - `c1` timestamp NOT NULL DEFAULT current_timestamp() ON UPDATE current_timestamp() + `c1` timestamp NOT NULL ) ENGINE=ENGINE DEFAULT CHARSET=latin1 DROP TABLE t5; SHOW TABLES; diff --git a/mysql-test/suite/engines/funcs/r/ta_add_string_middle2.result b/mysql-test/suite/engines/funcs/r/ta_add_string_middle2.result index 593090236fe..d3d28e0028a 100644 --- a/mysql-test/suite/engines/funcs/r/ta_add_string_middle2.result +++ b/mysql-test/suite/engines/funcs/r/ta_add_string_middle2.result @@ -398,7 +398,7 @@ t5 SHOW CREATE TABLE t5; Table Create Table t5 CREATE TABLE `t5` ( - `c1` timestamp NOT NULL DEFAULT current_timestamp() ON UPDATE current_timestamp(), + `c1` timestamp NOT NULL, `c2` int(11) NOT NULL, `c3` char(10) DEFAULT NULL, PRIMARY KEY (`c1`) @@ -410,7 +410,7 @@ t5 SHOW CREATE TABLE t5; Table Create Table t5 CREATE TABLE `t5` ( - `c1` timestamp NOT NULL DEFAULT current_timestamp() ON UPDATE current_timestamp(), + `c1` timestamp NOT NULL, `c2` int(11) NOT NULL, `c4` char(5) DEFAULT NULL, `c3` char(10) DEFAULT NULL, @@ -846,7 +846,7 @@ t5 SHOW CREATE TABLE t5; Table Create Table t5 CREATE TABLE `t5` ( - `c1` timestamp NOT NULL DEFAULT current_timestamp() ON UPDATE current_timestamp(), + `c1` timestamp NOT NULL, `c2` int(11) NOT NULL, `c3` char(10) NOT NULL, PRIMARY KEY (`c1`) @@ -858,7 +858,7 @@ t5 SHOW CREATE TABLE t5; Table Create Table t5 CREATE TABLE `t5` ( - `c1` timestamp NOT NULL DEFAULT current_timestamp() ON UPDATE current_timestamp(), + `c1` timestamp NOT NULL, `c2` int(11) NOT NULL, `c4` char(5) NOT NULL, `c3` char(10) NOT NULL, @@ -1294,7 +1294,7 @@ t5 SHOW CREATE TABLE t5; Table Create Table t5 CREATE TABLE `t5` ( - `c1` timestamp NOT NULL DEFAULT current_timestamp() ON UPDATE current_timestamp(), + `c1` timestamp NOT NULL, `c2` int(11) NOT NULL, `c3` varchar(10) DEFAULT NULL, PRIMARY KEY (`c1`) @@ -1306,7 +1306,7 @@ t5 SHOW CREATE TABLE t5; Table Create Table t5 CREATE TABLE `t5` ( - `c1` timestamp NOT NULL DEFAULT current_timestamp() ON UPDATE current_timestamp(), + `c1` timestamp NOT NULL, `c2` int(11) NOT NULL, `c4` varchar(5) DEFAULT NULL, `c3` varchar(10) DEFAULT NULL, @@ -1742,7 +1742,7 @@ t5 SHOW CREATE TABLE t5; Table Create Table t5 CREATE TABLE `t5` ( - `c1` timestamp NOT NULL DEFAULT current_timestamp() ON UPDATE current_timestamp(), + `c1` timestamp NOT NULL, `c2` int(11) NOT NULL, `c3` varchar(10) NOT NULL, PRIMARY KEY (`c1`) @@ -1754,7 +1754,7 @@ t5 SHOW CREATE TABLE t5; Table Create Table t5 CREATE TABLE `t5` ( - `c1` timestamp NOT NULL DEFAULT current_timestamp() ON UPDATE current_timestamp(), + `c1` timestamp NOT NULL, `c2` int(11) NOT NULL, `c4` varchar(5) NOT NULL, `c3` varchar(10) NOT NULL, @@ -2190,7 +2190,7 @@ t5 SHOW CREATE TABLE t5; Table Create Table t5 CREATE TABLE `t5` ( - `c1` timestamp NOT NULL DEFAULT current_timestamp() ON UPDATE current_timestamp(), + `c1` timestamp NOT NULL, `c2` int(11) NOT NULL, `c3` binary(10) DEFAULT NULL, PRIMARY KEY (`c1`) @@ -2202,7 +2202,7 @@ t5 SHOW CREATE TABLE t5; Table Create Table t5 CREATE TABLE `t5` ( - `c1` timestamp NOT NULL DEFAULT current_timestamp() ON UPDATE current_timestamp(), + `c1` timestamp NOT NULL, `c2` int(11) NOT NULL, `c4` binary(5) DEFAULT NULL, `c3` binary(10) DEFAULT NULL, @@ -2638,7 +2638,7 @@ t5 SHOW CREATE TABLE t5; Table Create Table t5 CREATE TABLE `t5` ( - `c1` timestamp NOT NULL DEFAULT current_timestamp() ON UPDATE current_timestamp(), + `c1` timestamp NOT NULL, `c2` int(11) NOT NULL, `c3` binary(10) NOT NULL, PRIMARY KEY (`c1`) @@ -2650,7 +2650,7 @@ t5 SHOW CREATE TABLE t5; Table Create Table t5 CREATE TABLE `t5` ( - `c1` timestamp NOT NULL DEFAULT current_timestamp() ON UPDATE current_timestamp(), + `c1` timestamp NOT NULL, `c2` int(11) NOT NULL, `c4` binary(5) NOT NULL, `c3` binary(10) NOT NULL, @@ -3086,7 +3086,7 @@ t5 SHOW CREATE TABLE t5; Table Create Table t5 CREATE TABLE `t5` ( - `c1` timestamp NOT NULL DEFAULT current_timestamp() ON UPDATE current_timestamp(), + `c1` timestamp NOT NULL, `c2` int(11) NOT NULL, `c3` varbinary(10) DEFAULT NULL, PRIMARY KEY (`c1`) @@ -3098,7 +3098,7 @@ t5 SHOW CREATE TABLE t5; Table Create Table t5 CREATE TABLE `t5` ( - `c1` timestamp NOT NULL DEFAULT current_timestamp() ON UPDATE current_timestamp(), + `c1` timestamp NOT NULL, `c2` int(11) NOT NULL, `c4` varbinary(5) DEFAULT NULL, `c3` varbinary(10) DEFAULT NULL, @@ -3534,7 +3534,7 @@ t5 SHOW CREATE TABLE t5; Table Create Table t5 CREATE TABLE `t5` ( - `c1` timestamp NOT NULL DEFAULT current_timestamp() ON UPDATE current_timestamp(), + `c1` timestamp NOT NULL, `c2` int(11) NOT NULL, `c3` varbinary(10) NOT NULL, PRIMARY KEY (`c1`) @@ -3546,7 +3546,7 @@ t5 SHOW CREATE TABLE t5; Table Create Table t5 CREATE TABLE `t5` ( - `c1` timestamp NOT NULL DEFAULT current_timestamp() ON UPDATE current_timestamp(), + `c1` timestamp NOT NULL, `c2` int(11) NOT NULL, `c4` varbinary(5) NOT NULL, `c3` varbinary(10) NOT NULL, diff --git a/mysql-test/suite/engines/funcs/r/ta_add_unique_index.result b/mysql-test/suite/engines/funcs/r/ta_add_unique_index.result index f963adbe673..478511a50e3 100644 --- a/mysql-test/suite/engines/funcs/r/ta_add_unique_index.result +++ b/mysql-test/suite/engines/funcs/r/ta_add_unique_index.result @@ -314,7 +314,7 @@ t1 SHOW CREATE TABLE t1; Table Create Table t1 CREATE TABLE `t1` ( - `c1` timestamp NOT NULL DEFAULT current_timestamp() ON UPDATE current_timestamp() + `c1` timestamp NOT NULL ) ENGINE=ENGINE DEFAULT CHARSET=latin1 ALTER TABLE t1 ADD UNIQUE (c1); SHOW TABLES; @@ -323,7 +323,7 @@ t1 SHOW CREATE TABLE t1; Table Create Table t1 CREATE TABLE `t1` ( - `c1` timestamp NOT NULL DEFAULT current_timestamp() ON UPDATE current_timestamp(), + `c1` timestamp NOT NULL, UNIQUE KEY `c1` (`c1`) ) ENGINE=ENGINE DEFAULT CHARSET=latin1 DROP TABLE t1; @@ -666,7 +666,7 @@ t1 SHOW CREATE TABLE t1; Table Create Table t1 CREATE TABLE `t1` ( - `c1` timestamp NOT NULL DEFAULT current_timestamp() ON UPDATE current_timestamp() + `c1` timestamp NOT NULL ) ENGINE=ENGINE DEFAULT CHARSET=latin1 ALTER TABLE t1 ADD UNIQUE KEY (c1); SHOW TABLES; @@ -675,7 +675,7 @@ t1 SHOW CREATE TABLE t1; Table Create Table t1 CREATE TABLE `t1` ( - `c1` timestamp NOT NULL DEFAULT current_timestamp() ON UPDATE current_timestamp(), + `c1` timestamp NOT NULL, UNIQUE KEY `c1` (`c1`) ) ENGINE=ENGINE DEFAULT CHARSET=latin1 DROP TABLE t1; @@ -1018,7 +1018,7 @@ t1 SHOW CREATE TABLE t1; Table Create Table t1 CREATE TABLE `t1` ( - `c1` timestamp NOT NULL DEFAULT current_timestamp() ON UPDATE current_timestamp() + `c1` timestamp NOT NULL ) ENGINE=ENGINE DEFAULT CHARSET=latin1 ALTER TABLE t1 ADD UNIQUE INDEX (c1); SHOW TABLES; @@ -1027,7 +1027,7 @@ t1 SHOW CREATE TABLE t1; Table Create Table t1 CREATE TABLE `t1` ( - `c1` timestamp NOT NULL DEFAULT current_timestamp() ON UPDATE current_timestamp(), + `c1` timestamp NOT NULL, UNIQUE KEY `c1` (`c1`) ) ENGINE=ENGINE DEFAULT CHARSET=latin1 DROP TABLE t1; @@ -1370,7 +1370,7 @@ t1 SHOW CREATE TABLE t1; Table Create Table t1 CREATE TABLE `t1` ( - `c1` timestamp NOT NULL DEFAULT current_timestamp() ON UPDATE current_timestamp() + `c1` timestamp NOT NULL ) ENGINE=ENGINE DEFAULT CHARSET=latin1 ALTER TABLE t1 ADD CONSTRAINT UNIQUE (c1); SHOW TABLES; @@ -1379,7 +1379,7 @@ t1 SHOW CREATE TABLE t1; Table Create Table t1 CREATE TABLE `t1` ( - `c1` timestamp NOT NULL DEFAULT current_timestamp() ON UPDATE current_timestamp(), + `c1` timestamp NOT NULL, UNIQUE KEY `c1` (`c1`) ) ENGINE=ENGINE DEFAULT CHARSET=latin1 DROP TABLE t1; @@ -1722,7 +1722,7 @@ t1 SHOW CREATE TABLE t1; Table Create Table t1 CREATE TABLE `t1` ( - `c1` timestamp NOT NULL DEFAULT current_timestamp() ON UPDATE current_timestamp() + `c1` timestamp NOT NULL ) ENGINE=ENGINE DEFAULT CHARSET=latin1 ALTER TABLE t1 ADD CONSTRAINT UNIQUE KEY (c1); SHOW TABLES; @@ -1731,7 +1731,7 @@ t1 SHOW CREATE TABLE t1; Table Create Table t1 CREATE TABLE `t1` ( - `c1` timestamp NOT NULL DEFAULT current_timestamp() ON UPDATE current_timestamp(), + `c1` timestamp NOT NULL, UNIQUE KEY `c1` (`c1`) ) ENGINE=ENGINE DEFAULT CHARSET=latin1 DROP TABLE t1; @@ -2074,7 +2074,7 @@ t1 SHOW CREATE TABLE t1; Table Create Table t1 CREATE TABLE `t1` ( - `c1` timestamp NOT NULL DEFAULT current_timestamp() ON UPDATE current_timestamp() + `c1` timestamp NOT NULL ) ENGINE=ENGINE DEFAULT CHARSET=latin1 ALTER TABLE t1 ADD CONSTRAINT UNIQUE INDEX (c1); SHOW TABLES; @@ -2083,7 +2083,7 @@ t1 SHOW CREATE TABLE t1; Table Create Table t1 CREATE TABLE `t1` ( - `c1` timestamp NOT NULL DEFAULT current_timestamp() ON UPDATE current_timestamp(), + `c1` timestamp NOT NULL, UNIQUE KEY `c1` (`c1`) ) ENGINE=ENGINE DEFAULT CHARSET=latin1 DROP TABLE t1; @@ -2426,7 +2426,7 @@ t1 SHOW CREATE TABLE t1; Table Create Table t1 CREATE TABLE `t1` ( - `c1` timestamp NOT NULL DEFAULT current_timestamp() ON UPDATE current_timestamp() + `c1` timestamp NOT NULL ) ENGINE=ENGINE DEFAULT CHARSET=latin1 ALTER TABLE t1 ADD CONSTRAINT cst1 UNIQUE (c1); SHOW TABLES; @@ -2435,7 +2435,7 @@ t1 SHOW CREATE TABLE t1; Table Create Table t1 CREATE TABLE `t1` ( - `c1` timestamp NOT NULL DEFAULT current_timestamp() ON UPDATE current_timestamp(), + `c1` timestamp NOT NULL, UNIQUE KEY `cst1` (`c1`) ) ENGINE=ENGINE DEFAULT CHARSET=latin1 DROP TABLE t1; @@ -2778,7 +2778,7 @@ t1 SHOW CREATE TABLE t1; Table Create Table t1 CREATE TABLE `t1` ( - `c1` timestamp NOT NULL DEFAULT current_timestamp() ON UPDATE current_timestamp() + `c1` timestamp NOT NULL ) ENGINE=ENGINE DEFAULT CHARSET=latin1 ALTER TABLE t1 ADD CONSTRAINT cst1 UNIQUE KEY (c1); SHOW TABLES; @@ -2787,7 +2787,7 @@ t1 SHOW CREATE TABLE t1; Table Create Table t1 CREATE TABLE `t1` ( - `c1` timestamp NOT NULL DEFAULT current_timestamp() ON UPDATE current_timestamp(), + `c1` timestamp NOT NULL, UNIQUE KEY `cst1` (`c1`) ) ENGINE=ENGINE DEFAULT CHARSET=latin1 DROP TABLE t1; @@ -3130,7 +3130,7 @@ t1 SHOW CREATE TABLE t1; Table Create Table t1 CREATE TABLE `t1` ( - `c1` timestamp NOT NULL DEFAULT current_timestamp() ON UPDATE current_timestamp() + `c1` timestamp NOT NULL ) ENGINE=ENGINE DEFAULT CHARSET=latin1 ALTER TABLE t1 ADD CONSTRAINT cst1 UNIQUE INDEX (c1); SHOW TABLES; @@ -3139,7 +3139,7 @@ t1 SHOW CREATE TABLE t1; Table Create Table t1 CREATE TABLE `t1` ( - `c1` timestamp NOT NULL DEFAULT current_timestamp() ON UPDATE current_timestamp(), + `c1` timestamp NOT NULL, UNIQUE KEY `cst1` (`c1`) ) ENGINE=ENGINE DEFAULT CHARSET=latin1 DROP TABLE t1; @@ -3482,7 +3482,7 @@ t1 SHOW CREATE TABLE t1; Table Create Table t1 CREATE TABLE `t1` ( - `c1` timestamp NOT NULL DEFAULT current_timestamp() ON UPDATE current_timestamp() + `c1` timestamp NOT NULL ) ENGINE=ENGINE DEFAULT CHARSET=latin1 ALTER TABLE t1 ADD UNIQUE i1 (c1); SHOW TABLES; @@ -3491,7 +3491,7 @@ t1 SHOW CREATE TABLE t1; Table Create Table t1 CREATE TABLE `t1` ( - `c1` timestamp NOT NULL DEFAULT current_timestamp() ON UPDATE current_timestamp(), + `c1` timestamp NOT NULL, UNIQUE KEY `i1` (`c1`) ) ENGINE=ENGINE DEFAULT CHARSET=latin1 DROP TABLE t1; @@ -3834,7 +3834,7 @@ t1 SHOW CREATE TABLE t1; Table Create Table t1 CREATE TABLE `t1` ( - `c1` timestamp NOT NULL DEFAULT current_timestamp() ON UPDATE current_timestamp() + `c1` timestamp NOT NULL ) ENGINE=ENGINE DEFAULT CHARSET=latin1 ALTER TABLE t1 ADD UNIQUE KEY i1 (c1); SHOW TABLES; @@ -3843,7 +3843,7 @@ t1 SHOW CREATE TABLE t1; Table Create Table t1 CREATE TABLE `t1` ( - `c1` timestamp NOT NULL DEFAULT current_timestamp() ON UPDATE current_timestamp(), + `c1` timestamp NOT NULL, UNIQUE KEY `i1` (`c1`) ) ENGINE=ENGINE DEFAULT CHARSET=latin1 DROP TABLE t1; @@ -4186,7 +4186,7 @@ t1 SHOW CREATE TABLE t1; Table Create Table t1 CREATE TABLE `t1` ( - `c1` timestamp NOT NULL DEFAULT current_timestamp() ON UPDATE current_timestamp() + `c1` timestamp NOT NULL ) ENGINE=ENGINE DEFAULT CHARSET=latin1 ALTER TABLE t1 ADD UNIQUE INDEX i1 (c1); SHOW TABLES; @@ -4195,7 +4195,7 @@ t1 SHOW CREATE TABLE t1; Table Create Table t1 CREATE TABLE `t1` ( - `c1` timestamp NOT NULL DEFAULT current_timestamp() ON UPDATE current_timestamp(), + `c1` timestamp NOT NULL, UNIQUE KEY `i1` (`c1`) ) ENGINE=ENGINE DEFAULT CHARSET=latin1 DROP TABLE t1; @@ -4538,7 +4538,7 @@ t1 SHOW CREATE TABLE t1; Table Create Table t1 CREATE TABLE `t1` ( - `c1` timestamp NOT NULL DEFAULT current_timestamp() ON UPDATE current_timestamp() + `c1` timestamp NOT NULL ) ENGINE=ENGINE DEFAULT CHARSET=latin1 ALTER TABLE t1 ADD CONSTRAINT UNIQUE i1 (c1); SHOW TABLES; @@ -4547,7 +4547,7 @@ t1 SHOW CREATE TABLE t1; Table Create Table t1 CREATE TABLE `t1` ( - `c1` timestamp NOT NULL DEFAULT current_timestamp() ON UPDATE current_timestamp(), + `c1` timestamp NOT NULL, UNIQUE KEY `i1` (`c1`) ) ENGINE=ENGINE DEFAULT CHARSET=latin1 DROP TABLE t1; @@ -4890,7 +4890,7 @@ t1 SHOW CREATE TABLE t1; Table Create Table t1 CREATE TABLE `t1` ( - `c1` timestamp NOT NULL DEFAULT current_timestamp() ON UPDATE current_timestamp() + `c1` timestamp NOT NULL ) ENGINE=ENGINE DEFAULT CHARSET=latin1 ALTER TABLE t1 ADD CONSTRAINT UNIQUE KEY i1 (c1); SHOW TABLES; @@ -4899,7 +4899,7 @@ t1 SHOW CREATE TABLE t1; Table Create Table t1 CREATE TABLE `t1` ( - `c1` timestamp NOT NULL DEFAULT current_timestamp() ON UPDATE current_timestamp(), + `c1` timestamp NOT NULL, UNIQUE KEY `i1` (`c1`) ) ENGINE=ENGINE DEFAULT CHARSET=latin1 DROP TABLE t1; @@ -5242,7 +5242,7 @@ t1 SHOW CREATE TABLE t1; Table Create Table t1 CREATE TABLE `t1` ( - `c1` timestamp NOT NULL DEFAULT current_timestamp() ON UPDATE current_timestamp() + `c1` timestamp NOT NULL ) ENGINE=ENGINE DEFAULT CHARSET=latin1 ALTER TABLE t1 ADD CONSTRAINT UNIQUE INDEX i1 (c1); SHOW TABLES; @@ -5251,7 +5251,7 @@ t1 SHOW CREATE TABLE t1; Table Create Table t1 CREATE TABLE `t1` ( - `c1` timestamp NOT NULL DEFAULT current_timestamp() ON UPDATE current_timestamp(), + `c1` timestamp NOT NULL, UNIQUE KEY `i1` (`c1`) ) ENGINE=ENGINE DEFAULT CHARSET=latin1 DROP TABLE t1; @@ -5594,7 +5594,7 @@ t1 SHOW CREATE TABLE t1; Table Create Table t1 CREATE TABLE `t1` ( - `c1` timestamp NOT NULL DEFAULT current_timestamp() ON UPDATE current_timestamp() + `c1` timestamp NOT NULL ) ENGINE=ENGINE DEFAULT CHARSET=latin1 ALTER TABLE t1 ADD CONSTRAINT cst1 UNIQUE i1 (c1); SHOW TABLES; @@ -5603,7 +5603,7 @@ t1 SHOW CREATE TABLE t1; Table Create Table t1 CREATE TABLE `t1` ( - `c1` timestamp NOT NULL DEFAULT current_timestamp() ON UPDATE current_timestamp(), + `c1` timestamp NOT NULL, UNIQUE KEY `i1` (`c1`) ) ENGINE=ENGINE DEFAULT CHARSET=latin1 DROP TABLE t1; @@ -5946,7 +5946,7 @@ t1 SHOW CREATE TABLE t1; Table Create Table t1 CREATE TABLE `t1` ( - `c1` timestamp NOT NULL DEFAULT current_timestamp() ON UPDATE current_timestamp() + `c1` timestamp NOT NULL ) ENGINE=ENGINE DEFAULT CHARSET=latin1 ALTER TABLE t1 ADD CONSTRAINT cst1 UNIQUE KEY i1 (c1); SHOW TABLES; @@ -5955,7 +5955,7 @@ t1 SHOW CREATE TABLE t1; Table Create Table t1 CREATE TABLE `t1` ( - `c1` timestamp NOT NULL DEFAULT current_timestamp() ON UPDATE current_timestamp(), + `c1` timestamp NOT NULL, UNIQUE KEY `i1` (`c1`) ) ENGINE=ENGINE DEFAULT CHARSET=latin1 DROP TABLE t1; @@ -6298,7 +6298,7 @@ t1 SHOW CREATE TABLE t1; Table Create Table t1 CREATE TABLE `t1` ( - `c1` timestamp NOT NULL DEFAULT current_timestamp() ON UPDATE current_timestamp() + `c1` timestamp NOT NULL ) ENGINE=ENGINE DEFAULT CHARSET=latin1 ALTER TABLE t1 ADD CONSTRAINT cst1 UNIQUE INDEX i1 (c1); SHOW TABLES; @@ -6307,7 +6307,7 @@ t1 SHOW CREATE TABLE t1; Table Create Table t1 CREATE TABLE `t1` ( - `c1` timestamp NOT NULL DEFAULT current_timestamp() ON UPDATE current_timestamp(), + `c1` timestamp NOT NULL, UNIQUE KEY `i1` (`c1`) ) ENGINE=ENGINE DEFAULT CHARSET=latin1 DROP TABLE t1; diff --git a/mysql-test/suite/engines/funcs/r/ta_column_to_index.result b/mysql-test/suite/engines/funcs/r/ta_column_to_index.result index 88986855ec2..dd2156e127c 100644 --- a/mysql-test/suite/engines/funcs/r/ta_column_to_index.result +++ b/mysql-test/suite/engines/funcs/r/ta_column_to_index.result @@ -314,7 +314,7 @@ t1 SHOW CREATE TABLE t1; Table Create Table t1 CREATE TABLE `t1` ( - `c1` timestamp NOT NULL DEFAULT current_timestamp() ON UPDATE current_timestamp() + `c1` timestamp NOT NULL ) ENGINE=ENGINE DEFAULT CHARSET=latin1 ALTER TABLE t1 ADD KEY (c1); SHOW TABLES; @@ -323,7 +323,7 @@ t1 SHOW CREATE TABLE t1; Table Create Table t1 CREATE TABLE `t1` ( - `c1` timestamp NOT NULL DEFAULT current_timestamp() ON UPDATE current_timestamp(), + `c1` timestamp NOT NULL, KEY `c1` (`c1`) ) ENGINE=ENGINE DEFAULT CHARSET=latin1 DROP TABLE t1; @@ -666,7 +666,7 @@ t1 SHOW CREATE TABLE t1; Table Create Table t1 CREATE TABLE `t1` ( - `c1` timestamp NOT NULL DEFAULT current_timestamp() ON UPDATE current_timestamp() + `c1` timestamp NOT NULL ) ENGINE=ENGINE DEFAULT CHARSET=latin1 ALTER TABLE t1 ADD KEY USING BTREE (c1); SHOW TABLES; @@ -675,7 +675,7 @@ t1 SHOW CREATE TABLE t1; Table Create Table t1 CREATE TABLE `t1` ( - `c1` timestamp NOT NULL DEFAULT current_timestamp() ON UPDATE current_timestamp(), + `c1` timestamp NOT NULL, KEY `c1` (`c1`) USING BTREE ) ENGINE=ENGINE DEFAULT CHARSET=latin1 DROP TABLE t1; @@ -1018,7 +1018,7 @@ t1 SHOW CREATE TABLE t1; Table Create Table t1 CREATE TABLE `t1` ( - `c1` timestamp NOT NULL DEFAULT current_timestamp() ON UPDATE current_timestamp() + `c1` timestamp NOT NULL ) ENGINE=ENGINE DEFAULT CHARSET=latin1 ALTER TABLE t1 ADD KEY USING HASH (c1); SHOW TABLES; @@ -1027,7 +1027,7 @@ t1 SHOW CREATE TABLE t1; Table Create Table t1 CREATE TABLE `t1` ( - `c1` timestamp NOT NULL DEFAULT current_timestamp() ON UPDATE current_timestamp(), + `c1` timestamp NOT NULL, KEY `c1` (`c1`) USING HASH ) ENGINE=ENGINE DEFAULT CHARSET=latin1 DROP TABLE t1; @@ -1370,7 +1370,7 @@ t1 SHOW CREATE TABLE t1; Table Create Table t1 CREATE TABLE `t1` ( - `c1` timestamp NOT NULL DEFAULT current_timestamp() ON UPDATE current_timestamp() + `c1` timestamp NOT NULL ) ENGINE=ENGINE DEFAULT CHARSET=latin1 ALTER TABLE t1 ADD INDEX (c1); SHOW TABLES; @@ -1379,7 +1379,7 @@ t1 SHOW CREATE TABLE t1; Table Create Table t1 CREATE TABLE `t1` ( - `c1` timestamp NOT NULL DEFAULT current_timestamp() ON UPDATE current_timestamp(), + `c1` timestamp NOT NULL, KEY `c1` (`c1`) ) ENGINE=ENGINE DEFAULT CHARSET=latin1 DROP TABLE t1; @@ -1722,7 +1722,7 @@ t1 SHOW CREATE TABLE t1; Table Create Table t1 CREATE TABLE `t1` ( - `c1` timestamp NOT NULL DEFAULT current_timestamp() ON UPDATE current_timestamp() + `c1` timestamp NOT NULL ) ENGINE=ENGINE DEFAULT CHARSET=latin1 ALTER TABLE t1 ADD INDEX USING BTREE (c1); SHOW TABLES; @@ -1731,7 +1731,7 @@ t1 SHOW CREATE TABLE t1; Table Create Table t1 CREATE TABLE `t1` ( - `c1` timestamp NOT NULL DEFAULT current_timestamp() ON UPDATE current_timestamp(), + `c1` timestamp NOT NULL, KEY `c1` (`c1`) USING BTREE ) ENGINE=ENGINE DEFAULT CHARSET=latin1 DROP TABLE t1; @@ -2074,7 +2074,7 @@ t1 SHOW CREATE TABLE t1; Table Create Table t1 CREATE TABLE `t1` ( - `c1` timestamp NOT NULL DEFAULT current_timestamp() ON UPDATE current_timestamp() + `c1` timestamp NOT NULL ) ENGINE=ENGINE DEFAULT CHARSET=latin1 ALTER TABLE t1 ADD INDEX USING HASH (c1); SHOW TABLES; @@ -2083,7 +2083,7 @@ t1 SHOW CREATE TABLE t1; Table Create Table t1 CREATE TABLE `t1` ( - `c1` timestamp NOT NULL DEFAULT current_timestamp() ON UPDATE current_timestamp(), + `c1` timestamp NOT NULL, KEY `c1` (`c1`) USING HASH ) ENGINE=ENGINE DEFAULT CHARSET=latin1 DROP TABLE t1; @@ -2426,7 +2426,7 @@ t1 SHOW CREATE TABLE t1; Table Create Table t1 CREATE TABLE `t1` ( - `c1` timestamp NOT NULL DEFAULT current_timestamp() ON UPDATE current_timestamp() + `c1` timestamp NOT NULL ) ENGINE=ENGINE DEFAULT CHARSET=latin1 ALTER TABLE t1 ADD KEY i1 (c1); SHOW TABLES; @@ -2435,7 +2435,7 @@ t1 SHOW CREATE TABLE t1; Table Create Table t1 CREATE TABLE `t1` ( - `c1` timestamp NOT NULL DEFAULT current_timestamp() ON UPDATE current_timestamp(), + `c1` timestamp NOT NULL, KEY `i1` (`c1`) ) ENGINE=ENGINE DEFAULT CHARSET=latin1 DROP TABLE t1; @@ -2778,7 +2778,7 @@ t1 SHOW CREATE TABLE t1; Table Create Table t1 CREATE TABLE `t1` ( - `c1` timestamp NOT NULL DEFAULT current_timestamp() ON UPDATE current_timestamp() + `c1` timestamp NOT NULL ) ENGINE=ENGINE DEFAULT CHARSET=latin1 ALTER TABLE t1 ADD KEY i1 USING BTREE (c1); SHOW TABLES; @@ -2787,7 +2787,7 @@ t1 SHOW CREATE TABLE t1; Table Create Table t1 CREATE TABLE `t1` ( - `c1` timestamp NOT NULL DEFAULT current_timestamp() ON UPDATE current_timestamp(), + `c1` timestamp NOT NULL, KEY `i1` (`c1`) USING BTREE ) ENGINE=ENGINE DEFAULT CHARSET=latin1 DROP TABLE t1; @@ -3130,7 +3130,7 @@ t1 SHOW CREATE TABLE t1; Table Create Table t1 CREATE TABLE `t1` ( - `c1` timestamp NOT NULL DEFAULT current_timestamp() ON UPDATE current_timestamp() + `c1` timestamp NOT NULL ) ENGINE=ENGINE DEFAULT CHARSET=latin1 ALTER TABLE t1 ADD KEY i1 USING HASH (c1); SHOW TABLES; @@ -3139,7 +3139,7 @@ t1 SHOW CREATE TABLE t1; Table Create Table t1 CREATE TABLE `t1` ( - `c1` timestamp NOT NULL DEFAULT current_timestamp() ON UPDATE current_timestamp(), + `c1` timestamp NOT NULL, KEY `i1` (`c1`) USING HASH ) ENGINE=ENGINE DEFAULT CHARSET=latin1 DROP TABLE t1; @@ -3482,7 +3482,7 @@ t1 SHOW CREATE TABLE t1; Table Create Table t1 CREATE TABLE `t1` ( - `c1` timestamp NOT NULL DEFAULT current_timestamp() ON UPDATE current_timestamp() + `c1` timestamp NOT NULL ) ENGINE=ENGINE DEFAULT CHARSET=latin1 ALTER TABLE t1 ADD INDEX i1 (c1); SHOW TABLES; @@ -3491,7 +3491,7 @@ t1 SHOW CREATE TABLE t1; Table Create Table t1 CREATE TABLE `t1` ( - `c1` timestamp NOT NULL DEFAULT current_timestamp() ON UPDATE current_timestamp(), + `c1` timestamp NOT NULL, KEY `i1` (`c1`) ) ENGINE=ENGINE DEFAULT CHARSET=latin1 DROP TABLE t1; @@ -3834,7 +3834,7 @@ t1 SHOW CREATE TABLE t1; Table Create Table t1 CREATE TABLE `t1` ( - `c1` timestamp NOT NULL DEFAULT current_timestamp() ON UPDATE current_timestamp() + `c1` timestamp NOT NULL ) ENGINE=ENGINE DEFAULT CHARSET=latin1 ALTER TABLE t1 ADD INDEX i1 USING BTREE (c1); SHOW TABLES; @@ -3843,7 +3843,7 @@ t1 SHOW CREATE TABLE t1; Table Create Table t1 CREATE TABLE `t1` ( - `c1` timestamp NOT NULL DEFAULT current_timestamp() ON UPDATE current_timestamp(), + `c1` timestamp NOT NULL, KEY `i1` (`c1`) USING BTREE ) ENGINE=ENGINE DEFAULT CHARSET=latin1 DROP TABLE t1; @@ -4186,7 +4186,7 @@ t1 SHOW CREATE TABLE t1; Table Create Table t1 CREATE TABLE `t1` ( - `c1` timestamp NOT NULL DEFAULT current_timestamp() ON UPDATE current_timestamp() + `c1` timestamp NOT NULL ) ENGINE=ENGINE DEFAULT CHARSET=latin1 ALTER TABLE t1 ADD INDEX i1 USING HASH (c1); SHOW TABLES; @@ -4195,7 +4195,7 @@ t1 SHOW CREATE TABLE t1; Table Create Table t1 CREATE TABLE `t1` ( - `c1` timestamp NOT NULL DEFAULT current_timestamp() ON UPDATE current_timestamp(), + `c1` timestamp NOT NULL, KEY `i1` (`c1`) USING HASH ) ENGINE=ENGINE DEFAULT CHARSET=latin1 DROP TABLE t1; diff --git a/mysql-test/suite/engines/funcs/r/ta_column_to_not_null.result b/mysql-test/suite/engines/funcs/r/ta_column_to_not_null.result index af6f47bdf45..20907a86a43 100644 --- a/mysql-test/suite/engines/funcs/r/ta_column_to_not_null.result +++ b/mysql-test/suite/engines/funcs/r/ta_column_to_not_null.result @@ -309,7 +309,7 @@ t1 SHOW CREATE TABLE t1; Table Create Table t1 CREATE TABLE `t1` ( - `c1` timestamp NOT NULL DEFAULT current_timestamp() ON UPDATE current_timestamp() + `c1` timestamp NOT NULL ) ENGINE=ENGINE DEFAULT CHARSET=latin1 DROP TABLE t1; SHOW TABLES; @@ -813,7 +813,7 @@ t1 SHOW CREATE TABLE t1; Table Create Table t1 CREATE TABLE `t1` ( - `c1` timestamp NOT NULL DEFAULT current_timestamp() ON UPDATE current_timestamp() + `c1` timestamp NOT NULL ) ENGINE=ENGINE DEFAULT CHARSET=latin1 DROP TABLE t1; SHOW TABLES; diff --git a/mysql-test/suite/engines/funcs/r/ta_column_to_null.result b/mysql-test/suite/engines/funcs/r/ta_column_to_null.result index 04850bedf1b..ea7c7b3df32 100644 --- a/mysql-test/suite/engines/funcs/r/ta_column_to_null.result +++ b/mysql-test/suite/engines/funcs/r/ta_column_to_null.result @@ -300,7 +300,7 @@ t2 SHOW CREATE TABLE t2; Table Create Table t2 CREATE TABLE `t2` ( - `c1` timestamp NOT NULL DEFAULT current_timestamp() ON UPDATE current_timestamp() + `c1` timestamp NOT NULL ) ENGINE=ENGINE DEFAULT CHARSET=latin1 ALTER TABLE t2 MODIFY c1 TIMESTAMP NULL; SHOW TABLES; @@ -804,7 +804,7 @@ t2 SHOW CREATE TABLE t2; Table Create Table t2 CREATE TABLE `t2` ( - `c1` timestamp NOT NULL DEFAULT current_timestamp() ON UPDATE current_timestamp() + `c1` timestamp NOT NULL ) ENGINE=ENGINE DEFAULT CHARSET=latin1 ALTER TABLE t2 CHANGE c1 c1 TIMESTAMP NULL; SHOW TABLES; diff --git a/mysql-test/suite/engines/funcs/r/ta_column_to_pk.result b/mysql-test/suite/engines/funcs/r/ta_column_to_pk.result index c76df99b424..4b91b5ee424 100644 --- a/mysql-test/suite/engines/funcs/r/ta_column_to_pk.result +++ b/mysql-test/suite/engines/funcs/r/ta_column_to_pk.result @@ -314,7 +314,7 @@ t1 SHOW CREATE TABLE t1; Table Create Table t1 CREATE TABLE `t1` ( - `c1` timestamp NOT NULL DEFAULT current_timestamp() ON UPDATE current_timestamp() + `c1` timestamp NOT NULL ) ENGINE=ENGINE DEFAULT CHARSET=latin1 ALTER TABLE t1 ADD PRIMARY KEY (c1); SHOW TABLES; @@ -323,7 +323,7 @@ t1 SHOW CREATE TABLE t1; Table Create Table t1 CREATE TABLE `t1` ( - `c1` timestamp NOT NULL DEFAULT current_timestamp() ON UPDATE current_timestamp(), + `c1` timestamp NOT NULL, PRIMARY KEY (`c1`) ) ENGINE=ENGINE DEFAULT CHARSET=latin1 DROP TABLE t1; diff --git a/mysql-test/suite/engines/funcs/r/ta_drop_column.result b/mysql-test/suite/engines/funcs/r/ta_drop_column.result index b650da1fdf3..79f6748acd9 100644 --- a/mysql-test/suite/engines/funcs/r/ta_drop_column.result +++ b/mysql-test/suite/engines/funcs/r/ta_drop_column.result @@ -300,8 +300,8 @@ t1 SHOW CREATE TABLE t1; Table Create Table t1 CREATE TABLE `t1` ( - `c1` timestamp NOT NULL DEFAULT current_timestamp() ON UPDATE current_timestamp(), - `c2` timestamp NOT NULL DEFAULT '0000-00-00 00:00:00' + `c1` timestamp NOT NULL, + `c2` timestamp NULL DEFAULT NULL ) ENGINE=ENGINE DEFAULT CHARSET=latin1 ALTER TABLE t1 DROP c2; ALTER TABLE t1 DROP c1; @@ -309,7 +309,7 @@ ERROR 42000: You can't delete all columns with ALTER TABLE; use DROP TABLE inste SHOW CREATE TABLE t1; Table Create Table t1 CREATE TABLE `t1` ( - `c1` timestamp NOT NULL DEFAULT current_timestamp() ON UPDATE current_timestamp() + `c1` timestamp NOT NULL ) ENGINE=ENGINE DEFAULT CHARSET=latin1 DROP TABLE t1; SHOW TABLES; @@ -636,8 +636,8 @@ t1 SHOW CREATE TABLE t1; Table Create Table t1 CREATE TABLE `t1` ( - `c1` timestamp NOT NULL DEFAULT current_timestamp() ON UPDATE current_timestamp(), - `c2` timestamp NOT NULL DEFAULT '0000-00-00 00:00:00' + `c1` timestamp NOT NULL, + `c2` timestamp NULL DEFAULT NULL ) ENGINE=ENGINE DEFAULT CHARSET=latin1 ALTER TABLE t1 DROP COLUMN c2; ALTER TABLE t1 DROP COLUMN c1; @@ -645,7 +645,7 @@ ERROR 42000: You can't delete all columns with ALTER TABLE; use DROP TABLE inste SHOW CREATE TABLE t1; Table Create Table t1 CREATE TABLE `t1` ( - `c1` timestamp NOT NULL DEFAULT current_timestamp() ON UPDATE current_timestamp() + `c1` timestamp NOT NULL ) ENGINE=ENGINE DEFAULT CHARSET=latin1 DROP TABLE t1; SHOW TABLES; diff --git a/mysql-test/suite/engines/funcs/r/ta_drop_index.result b/mysql-test/suite/engines/funcs/r/ta_drop_index.result index 1dface5be50..06304df6707 100644 --- a/mysql-test/suite/engines/funcs/r/ta_drop_index.result +++ b/mysql-test/suite/engines/funcs/r/ta_drop_index.result @@ -314,7 +314,7 @@ t1 SHOW CREATE TABLE t1; Table Create Table t1 CREATE TABLE `t1` ( - `c1` timestamp NOT NULL DEFAULT current_timestamp() ON UPDATE current_timestamp(), + `c1` timestamp NOT NULL, KEY `i1` (`c1`) ) ENGINE=ENGINE DEFAULT CHARSET=latin1 ALTER TABLE t1 DROP KEY i1; @@ -324,7 +324,7 @@ t1 SHOW CREATE TABLE t1; Table Create Table t1 CREATE TABLE `t1` ( - `c1` timestamp NOT NULL DEFAULT current_timestamp() ON UPDATE current_timestamp() + `c1` timestamp NOT NULL ) ENGINE=ENGINE DEFAULT CHARSET=latin1 DROP TABLE t1; SHOW TABLES; @@ -666,7 +666,7 @@ t1 SHOW CREATE TABLE t1; Table Create Table t1 CREATE TABLE `t1` ( - `c1` timestamp NOT NULL DEFAULT current_timestamp() ON UPDATE current_timestamp(), + `c1` timestamp NOT NULL, KEY `i1` (`c1`) ) ENGINE=ENGINE DEFAULT CHARSET=latin1 ALTER TABLE t1 DROP KEY i1; @@ -676,7 +676,7 @@ t1 SHOW CREATE TABLE t1; Table Create Table t1 CREATE TABLE `t1` ( - `c1` timestamp NOT NULL DEFAULT current_timestamp() ON UPDATE current_timestamp() + `c1` timestamp NOT NULL ) ENGINE=ENGINE DEFAULT CHARSET=latin1 DROP TABLE t1; SHOW TABLES; @@ -1018,7 +1018,7 @@ t1 SHOW CREATE TABLE t1; Table Create Table t1 CREATE TABLE `t1` ( - `c1` timestamp NOT NULL DEFAULT current_timestamp() ON UPDATE current_timestamp(), + `c1` timestamp NOT NULL, KEY `i1` (`c1`) ) ENGINE=ENGINE DEFAULT CHARSET=latin1 ALTER TABLE t1 DROP KEY i1; @@ -1028,7 +1028,7 @@ t1 SHOW CREATE TABLE t1; Table Create Table t1 CREATE TABLE `t1` ( - `c1` timestamp NOT NULL DEFAULT current_timestamp() ON UPDATE current_timestamp() + `c1` timestamp NOT NULL ) ENGINE=ENGINE DEFAULT CHARSET=latin1 DROP TABLE t1; SHOW TABLES; @@ -1370,7 +1370,7 @@ t1 SHOW CREATE TABLE t1; Table Create Table t1 CREATE TABLE `t1` ( - `c1` timestamp NOT NULL DEFAULT current_timestamp() ON UPDATE current_timestamp(), + `c1` timestamp NOT NULL, KEY `i1` (`c1`) ) ENGINE=ENGINE DEFAULT CHARSET=latin1 ALTER TABLE t1 DROP INDEX i1; @@ -1380,7 +1380,7 @@ t1 SHOW CREATE TABLE t1; Table Create Table t1 CREATE TABLE `t1` ( - `c1` timestamp NOT NULL DEFAULT current_timestamp() ON UPDATE current_timestamp() + `c1` timestamp NOT NULL ) ENGINE=ENGINE DEFAULT CHARSET=latin1 DROP TABLE t1; SHOW TABLES; @@ -1722,7 +1722,7 @@ t1 SHOW CREATE TABLE t1; Table Create Table t1 CREATE TABLE `t1` ( - `c1` timestamp NOT NULL DEFAULT current_timestamp() ON UPDATE current_timestamp(), + `c1` timestamp NOT NULL, KEY `i1` (`c1`) ) ENGINE=ENGINE DEFAULT CHARSET=latin1 ALTER TABLE t1 DROP INDEX i1; @@ -1732,7 +1732,7 @@ t1 SHOW CREATE TABLE t1; Table Create Table t1 CREATE TABLE `t1` ( - `c1` timestamp NOT NULL DEFAULT current_timestamp() ON UPDATE current_timestamp() + `c1` timestamp NOT NULL ) ENGINE=ENGINE DEFAULT CHARSET=latin1 DROP TABLE t1; SHOW TABLES; @@ -2074,7 +2074,7 @@ t1 SHOW CREATE TABLE t1; Table Create Table t1 CREATE TABLE `t1` ( - `c1` timestamp NOT NULL DEFAULT current_timestamp() ON UPDATE current_timestamp(), + `c1` timestamp NOT NULL, KEY `i1` (`c1`) ) ENGINE=ENGINE DEFAULT CHARSET=latin1 ALTER TABLE t1 DROP INDEX i1; @@ -2084,7 +2084,7 @@ t1 SHOW CREATE TABLE t1; Table Create Table t1 CREATE TABLE `t1` ( - `c1` timestamp NOT NULL DEFAULT current_timestamp() ON UPDATE current_timestamp() + `c1` timestamp NOT NULL ) ENGINE=ENGINE DEFAULT CHARSET=latin1 DROP TABLE t1; SHOW TABLES; diff --git a/mysql-test/suite/engines/funcs/r/ta_drop_pk_number.result b/mysql-test/suite/engines/funcs/r/ta_drop_pk_number.result index 554037236cc..aadbbbf3fb3 100644 --- a/mysql-test/suite/engines/funcs/r/ta_drop_pk_number.result +++ b/mysql-test/suite/engines/funcs/r/ta_drop_pk_number.result @@ -314,7 +314,7 @@ t9 SHOW CREATE TABLE t9; Table Create Table t9 CREATE TABLE `t9` ( - `c1` timestamp NOT NULL DEFAULT current_timestamp() ON UPDATE current_timestamp(), + `c1` timestamp NOT NULL, PRIMARY KEY (`c1`) ) ENGINE=ENGINE DEFAULT CHARSET=latin1 ALTER TABLE t9 DROP PRIMARY KEY; @@ -324,7 +324,7 @@ t9 SHOW CREATE TABLE t9; Table Create Table t9 CREATE TABLE `t9` ( - `c1` timestamp NOT NULL DEFAULT current_timestamp() ON UPDATE current_timestamp() + `c1` timestamp NOT NULL ) ENGINE=ENGINE DEFAULT CHARSET=latin1 DROP TABLE t9; SHOW TABLES; diff --git a/mysql-test/suite/engines/funcs/r/ta_rename.result b/mysql-test/suite/engines/funcs/r/ta_rename.result index f3d2a4aa514..91a085c0bc3 100644 --- a/mysql-test/suite/engines/funcs/r/ta_rename.result +++ b/mysql-test/suite/engines/funcs/r/ta_rename.result @@ -356,8 +356,8 @@ t1 SHOW CREATE TABLE t1; Table Create Table t1 CREATE TABLE `t1` ( - `c1` timestamp NOT NULL DEFAULT current_timestamp() ON UPDATE current_timestamp(), - `c2` timestamp NOT NULL DEFAULT '0000-00-00 00:00:00' + `c1` timestamp NOT NULL, + `c2` timestamp NULL DEFAULT NULL ) ENGINE=ENGINE DEFAULT CHARSET=latin1 ALTER TABLE t1 RENAME t2; SHOW TABLES; @@ -368,8 +368,8 @@ ERROR 42S02: Unknown table 'test.t1' SHOW CREATE TABLE t2; Table Create Table t2 CREATE TABLE `t2` ( - `c1` timestamp NOT NULL DEFAULT current_timestamp() ON UPDATE current_timestamp(), - `c2` timestamp NOT NULL DEFAULT '0000-00-00 00:00:00' + `c1` timestamp NOT NULL, + `c2` timestamp NULL DEFAULT NULL ) ENGINE=ENGINE DEFAULT CHARSET=latin1 DROP TABLE t2; SHOW TABLES; @@ -756,8 +756,8 @@ t1 SHOW CREATE TABLE t1; Table Create Table t1 CREATE TABLE `t1` ( - `c1` timestamp NOT NULL DEFAULT current_timestamp() ON UPDATE current_timestamp(), - `c2` timestamp NOT NULL DEFAULT '0000-00-00 00:00:00' + `c1` timestamp NOT NULL, + `c2` timestamp NULL DEFAULT NULL ) ENGINE=ENGINE DEFAULT CHARSET=latin1 ALTER TABLE t1 RENAME TO t2; SHOW TABLES; @@ -768,8 +768,8 @@ ERROR 42S02: Unknown table 'test.t1' SHOW CREATE TABLE t2; Table Create Table t2 CREATE TABLE `t2` ( - `c1` timestamp NOT NULL DEFAULT current_timestamp() ON UPDATE current_timestamp(), - `c2` timestamp NOT NULL DEFAULT '0000-00-00 00:00:00' + `c1` timestamp NOT NULL, + `c2` timestamp NULL DEFAULT NULL ) ENGINE=ENGINE DEFAULT CHARSET=latin1 DROP TABLE t2; SHOW TABLES; diff --git a/mysql-test/suite/engines/funcs/r/tc_column_key.result b/mysql-test/suite/engines/funcs/r/tc_column_key.result index dd7b96787e2..26894d34544 100644 --- a/mysql-test/suite/engines/funcs/r/tc_column_key.result +++ b/mysql-test/suite/engines/funcs/r/tc_column_key.result @@ -227,7 +227,7 @@ t9 SHOW CREATE TABLE t9; Table Create Table t9 CREATE TABLE `t9` ( - `c1` timestamp NOT NULL DEFAULT current_timestamp() ON UPDATE current_timestamp(), + `c1` timestamp NOT NULL, PRIMARY KEY (`c1`) ) ENGINE=ENGINE DEFAULT CHARSET=latin1 DROP TABLE t9; diff --git a/mysql-test/suite/engines/funcs/r/tc_column_not_null.result b/mysql-test/suite/engines/funcs/r/tc_column_not_null.result index 2faf94fa930..c726e3cd8c6 100644 --- a/mysql-test/suite/engines/funcs/r/tc_column_not_null.result +++ b/mysql-test/suite/engines/funcs/r/tc_column_not_null.result @@ -210,7 +210,7 @@ t2 SHOW CREATE TABLE t2; Table Create Table t2 CREATE TABLE `t2` ( - `c1` timestamp NOT NULL DEFAULT current_timestamp() ON UPDATE current_timestamp() + `c1` timestamp NOT NULL ) ENGINE=ENGINE DEFAULT CHARSET=latin1 DROP TABLE t2; SHOW TABLES; diff --git a/mysql-test/suite/engines/funcs/r/tc_column_primary_key_number.result b/mysql-test/suite/engines/funcs/r/tc_column_primary_key_number.result index 16337051d2d..db858df9a18 100644 --- a/mysql-test/suite/engines/funcs/r/tc_column_primary_key_number.result +++ b/mysql-test/suite/engines/funcs/r/tc_column_primary_key_number.result @@ -227,7 +227,7 @@ t9 SHOW CREATE TABLE t9; Table Create Table t9 CREATE TABLE `t9` ( - `c1` timestamp NOT NULL DEFAULT current_timestamp() ON UPDATE current_timestamp(), + `c1` timestamp NOT NULL, PRIMARY KEY (`c1`) ) ENGINE=ENGINE DEFAULT CHARSET=latin1 DROP TABLE t9; diff --git a/mysql-test/suite/engines/funcs/r/tc_column_unique_key.result b/mysql-test/suite/engines/funcs/r/tc_column_unique_key.result index baba2510e5a..e4be3e15db0 100644 --- a/mysql-test/suite/engines/funcs/r/tc_column_unique_key.result +++ b/mysql-test/suite/engines/funcs/r/tc_column_unique_key.result @@ -227,7 +227,7 @@ t9 SHOW CREATE TABLE t9; Table Create Table t9 CREATE TABLE `t9` ( - `c1` timestamp NOT NULL DEFAULT current_timestamp() ON UPDATE current_timestamp(), + `c1` timestamp NOT NULL, UNIQUE KEY `c1` (`c1`) ) ENGINE=ENGINE DEFAULT CHARSET=latin1 DROP TABLE t9; diff --git a/mysql-test/suite/engines/funcs/r/tc_multicolumn_different.result b/mysql-test/suite/engines/funcs/r/tc_multicolumn_different.result index 16be4f4b08c..f9b7da97e8d 100644 --- a/mysql-test/suite/engines/funcs/r/tc_multicolumn_different.result +++ b/mysql-test/suite/engines/funcs/r/tc_multicolumn_different.result @@ -333,7 +333,7 @@ m3 CREATE TABLE `m3` ( `c2` char(25) NOT NULL, `c3` tinyint(4) DEFAULT NULL, `c4` char(15) NOT NULL, - `c5` timestamp NOT NULL DEFAULT '0000-00-00 00:00:00', + `c5` timestamp NOT NULL, `c6` decimal(10,8) NOT NULL DEFAULT 3.14159200, PRIMARY KEY (`c4`), UNIQUE KEY `c5` (`c5`) @@ -713,7 +713,7 @@ m3 CREATE TABLE `m3` ( `c2` char(25) NOT NULL, `c3` smallint(4) DEFAULT NULL, `c4` char(15) NOT NULL, - `c5` timestamp NOT NULL DEFAULT '0000-00-00 00:00:00', + `c5` timestamp NOT NULL, `c6` decimal(10,8) NOT NULL DEFAULT 3.14159200, PRIMARY KEY (`c4`), UNIQUE KEY `c5` (`c5`) @@ -1093,7 +1093,7 @@ m3 CREATE TABLE `m3` ( `c2` char(25) NOT NULL, `c3` mediumint(4) DEFAULT NULL, `c4` char(15) NOT NULL, - `c5` timestamp NOT NULL DEFAULT '0000-00-00 00:00:00', + `c5` timestamp NOT NULL, `c6` decimal(10,8) NOT NULL DEFAULT 3.14159200, PRIMARY KEY (`c4`), UNIQUE KEY `c5` (`c5`) @@ -1473,7 +1473,7 @@ m3 CREATE TABLE `m3` ( `c2` char(25) NOT NULL, `c3` int(4) DEFAULT NULL, `c4` char(15) NOT NULL, - `c5` timestamp NOT NULL DEFAULT '0000-00-00 00:00:00', + `c5` timestamp NOT NULL, `c6` decimal(10,8) NOT NULL DEFAULT 3.14159200, PRIMARY KEY (`c4`), UNIQUE KEY `c5` (`c5`) @@ -1853,7 +1853,7 @@ m3 CREATE TABLE `m3` ( `c2` char(25) NOT NULL, `c3` int(4) DEFAULT NULL, `c4` char(15) NOT NULL, - `c5` timestamp NOT NULL DEFAULT '0000-00-00 00:00:00', + `c5` timestamp NOT NULL, `c6` decimal(10,8) NOT NULL DEFAULT 3.14159200, PRIMARY KEY (`c4`), UNIQUE KEY `c5` (`c5`) @@ -2233,7 +2233,7 @@ m3 CREATE TABLE `m3` ( `c2` char(25) NOT NULL, `c3` bigint(4) DEFAULT NULL, `c4` char(15) NOT NULL, - `c5` timestamp NOT NULL DEFAULT '0000-00-00 00:00:00', + `c5` timestamp NOT NULL, `c6` decimal(10,8) NOT NULL DEFAULT 3.14159200, PRIMARY KEY (`c4`), UNIQUE KEY `c5` (`c5`) @@ -2613,7 +2613,7 @@ m3 CREATE TABLE `m3` ( `c2` varchar(25) NOT NULL, `c3` tinyint(4) DEFAULT NULL, `c4` varchar(15) NOT NULL, - `c5` timestamp NOT NULL DEFAULT '0000-00-00 00:00:00', + `c5` timestamp NOT NULL, `c6` decimal(10,8) NOT NULL DEFAULT 3.14159200, PRIMARY KEY (`c4`), UNIQUE KEY `c5` (`c5`) @@ -2993,7 +2993,7 @@ m3 CREATE TABLE `m3` ( `c2` varchar(25) NOT NULL, `c3` smallint(4) DEFAULT NULL, `c4` varchar(15) NOT NULL, - `c5` timestamp NOT NULL DEFAULT '0000-00-00 00:00:00', + `c5` timestamp NOT NULL, `c6` decimal(10,8) NOT NULL DEFAULT 3.14159200, PRIMARY KEY (`c4`), UNIQUE KEY `c5` (`c5`) @@ -3373,7 +3373,7 @@ m3 CREATE TABLE `m3` ( `c2` varchar(25) NOT NULL, `c3` mediumint(4) DEFAULT NULL, `c4` varchar(15) NOT NULL, - `c5` timestamp NOT NULL DEFAULT '0000-00-00 00:00:00', + `c5` timestamp NOT NULL, `c6` decimal(10,8) NOT NULL DEFAULT 3.14159200, PRIMARY KEY (`c4`), UNIQUE KEY `c5` (`c5`) @@ -3753,7 +3753,7 @@ m3 CREATE TABLE `m3` ( `c2` varchar(25) NOT NULL, `c3` int(4) DEFAULT NULL, `c4` varchar(15) NOT NULL, - `c5` timestamp NOT NULL DEFAULT '0000-00-00 00:00:00', + `c5` timestamp NOT NULL, `c6` decimal(10,8) NOT NULL DEFAULT 3.14159200, PRIMARY KEY (`c4`), UNIQUE KEY `c5` (`c5`) @@ -4133,7 +4133,7 @@ m3 CREATE TABLE `m3` ( `c2` varchar(25) NOT NULL, `c3` int(4) DEFAULT NULL, `c4` varchar(15) NOT NULL, - `c5` timestamp NOT NULL DEFAULT '0000-00-00 00:00:00', + `c5` timestamp NOT NULL, `c6` decimal(10,8) NOT NULL DEFAULT 3.14159200, PRIMARY KEY (`c4`), UNIQUE KEY `c5` (`c5`) @@ -4513,7 +4513,7 @@ m3 CREATE TABLE `m3` ( `c2` varchar(25) NOT NULL, `c3` bigint(4) DEFAULT NULL, `c4` varchar(15) NOT NULL, - `c5` timestamp NOT NULL DEFAULT '0000-00-00 00:00:00', + `c5` timestamp NOT NULL, `c6` decimal(10,8) NOT NULL DEFAULT 3.14159200, PRIMARY KEY (`c4`), UNIQUE KEY `c5` (`c5`) @@ -4893,7 +4893,7 @@ m3 CREATE TABLE `m3` ( `c2` binary(25) NOT NULL, `c3` tinyint(4) DEFAULT NULL, `c4` binary(15) NOT NULL, - `c5` timestamp NOT NULL DEFAULT '0000-00-00 00:00:00', + `c5` timestamp NOT NULL, `c6` decimal(10,8) NOT NULL DEFAULT 3.14159200, PRIMARY KEY (`c4`), UNIQUE KEY `c5` (`c5`) @@ -5273,7 +5273,7 @@ m3 CREATE TABLE `m3` ( `c2` binary(25) NOT NULL, `c3` smallint(4) DEFAULT NULL, `c4` binary(15) NOT NULL, - `c5` timestamp NOT NULL DEFAULT '0000-00-00 00:00:00', + `c5` timestamp NOT NULL, `c6` decimal(10,8) NOT NULL DEFAULT 3.14159200, PRIMARY KEY (`c4`), UNIQUE KEY `c5` (`c5`) @@ -5653,7 +5653,7 @@ m3 CREATE TABLE `m3` ( `c2` binary(25) NOT NULL, `c3` mediumint(4) DEFAULT NULL, `c4` binary(15) NOT NULL, - `c5` timestamp NOT NULL DEFAULT '0000-00-00 00:00:00', + `c5` timestamp NOT NULL, `c6` decimal(10,8) NOT NULL DEFAULT 3.14159200, PRIMARY KEY (`c4`), UNIQUE KEY `c5` (`c5`) @@ -6033,7 +6033,7 @@ m3 CREATE TABLE `m3` ( `c2` binary(25) NOT NULL, `c3` int(4) DEFAULT NULL, `c4` binary(15) NOT NULL, - `c5` timestamp NOT NULL DEFAULT '0000-00-00 00:00:00', + `c5` timestamp NOT NULL, `c6` decimal(10,8) NOT NULL DEFAULT 3.14159200, PRIMARY KEY (`c4`), UNIQUE KEY `c5` (`c5`) @@ -6413,7 +6413,7 @@ m3 CREATE TABLE `m3` ( `c2` binary(25) NOT NULL, `c3` int(4) DEFAULT NULL, `c4` binary(15) NOT NULL, - `c5` timestamp NOT NULL DEFAULT '0000-00-00 00:00:00', + `c5` timestamp NOT NULL, `c6` decimal(10,8) NOT NULL DEFAULT 3.14159200, PRIMARY KEY (`c4`), UNIQUE KEY `c5` (`c5`) @@ -6793,7 +6793,7 @@ m3 CREATE TABLE `m3` ( `c2` binary(25) NOT NULL, `c3` bigint(4) DEFAULT NULL, `c4` binary(15) NOT NULL, - `c5` timestamp NOT NULL DEFAULT '0000-00-00 00:00:00', + `c5` timestamp NOT NULL, `c6` decimal(10,8) NOT NULL DEFAULT 3.14159200, PRIMARY KEY (`c4`), UNIQUE KEY `c5` (`c5`) @@ -7173,7 +7173,7 @@ m3 CREATE TABLE `m3` ( `c2` varbinary(25) NOT NULL, `c3` tinyint(4) DEFAULT NULL, `c4` varbinary(15) NOT NULL, - `c5` timestamp NOT NULL DEFAULT '0000-00-00 00:00:00', + `c5` timestamp NOT NULL, `c6` decimal(10,8) NOT NULL DEFAULT 3.14159200, PRIMARY KEY (`c4`), UNIQUE KEY `c5` (`c5`) @@ -7553,7 +7553,7 @@ m3 CREATE TABLE `m3` ( `c2` varbinary(25) NOT NULL, `c3` smallint(4) DEFAULT NULL, `c4` varbinary(15) NOT NULL, - `c5` timestamp NOT NULL DEFAULT '0000-00-00 00:00:00', + `c5` timestamp NOT NULL, `c6` decimal(10,8) NOT NULL DEFAULT 3.14159200, PRIMARY KEY (`c4`), UNIQUE KEY `c5` (`c5`) @@ -7933,7 +7933,7 @@ m3 CREATE TABLE `m3` ( `c2` varbinary(25) NOT NULL, `c3` mediumint(4) DEFAULT NULL, `c4` varbinary(15) NOT NULL, - `c5` timestamp NOT NULL DEFAULT '0000-00-00 00:00:00', + `c5` timestamp NOT NULL, `c6` decimal(10,8) NOT NULL DEFAULT 3.14159200, PRIMARY KEY (`c4`), UNIQUE KEY `c5` (`c5`) @@ -8313,7 +8313,7 @@ m3 CREATE TABLE `m3` ( `c2` varbinary(25) NOT NULL, `c3` int(4) DEFAULT NULL, `c4` varbinary(15) NOT NULL, - `c5` timestamp NOT NULL DEFAULT '0000-00-00 00:00:00', + `c5` timestamp NOT NULL, `c6` decimal(10,8) NOT NULL DEFAULT 3.14159200, PRIMARY KEY (`c4`), UNIQUE KEY `c5` (`c5`) @@ -8693,7 +8693,7 @@ m3 CREATE TABLE `m3` ( `c2` varbinary(25) NOT NULL, `c3` int(4) DEFAULT NULL, `c4` varbinary(15) NOT NULL, - `c5` timestamp NOT NULL DEFAULT '0000-00-00 00:00:00', + `c5` timestamp NOT NULL, `c6` decimal(10,8) NOT NULL DEFAULT 3.14159200, PRIMARY KEY (`c4`), UNIQUE KEY `c5` (`c5`) @@ -9073,7 +9073,7 @@ m3 CREATE TABLE `m3` ( `c2` varbinary(25) NOT NULL, `c3` bigint(4) DEFAULT NULL, `c4` varbinary(15) NOT NULL, - `c5` timestamp NOT NULL DEFAULT '0000-00-00 00:00:00', + `c5` timestamp NOT NULL, `c6` decimal(10,8) NOT NULL DEFAULT 3.14159200, PRIMARY KEY (`c4`), UNIQUE KEY `c5` (`c5`) @@ -9453,7 +9453,7 @@ m3 CREATE TABLE `m3` ( `c2` char(25) NOT NULL, `c3` tinyint(4) DEFAULT NULL, `c4` char(15) NOT NULL, - `c5` timestamp NOT NULL DEFAULT '0000-00-00 00:00:00', + `c5` timestamp NOT NULL, `c6` decimal(10,8) NOT NULL DEFAULT 3.14159200, PRIMARY KEY (`c4`), UNIQUE KEY `c5` (`c5`) @@ -9833,7 +9833,7 @@ m3 CREATE TABLE `m3` ( `c2` char(25) NOT NULL, `c3` smallint(4) DEFAULT NULL, `c4` char(15) NOT NULL, - `c5` timestamp NOT NULL DEFAULT '0000-00-00 00:00:00', + `c5` timestamp NOT NULL, `c6` decimal(10,8) NOT NULL DEFAULT 3.14159200, PRIMARY KEY (`c4`), UNIQUE KEY `c5` (`c5`) @@ -10213,7 +10213,7 @@ m3 CREATE TABLE `m3` ( `c2` char(25) NOT NULL, `c3` mediumint(4) DEFAULT NULL, `c4` char(15) NOT NULL, - `c5` timestamp NOT NULL DEFAULT '0000-00-00 00:00:00', + `c5` timestamp NOT NULL, `c6` decimal(10,8) NOT NULL DEFAULT 3.14159200, PRIMARY KEY (`c4`), UNIQUE KEY `c5` (`c5`) @@ -10593,7 +10593,7 @@ m3 CREATE TABLE `m3` ( `c2` char(25) NOT NULL, `c3` int(4) DEFAULT NULL, `c4` char(15) NOT NULL, - `c5` timestamp NOT NULL DEFAULT '0000-00-00 00:00:00', + `c5` timestamp NOT NULL, `c6` decimal(10,8) NOT NULL DEFAULT 3.14159200, PRIMARY KEY (`c4`), UNIQUE KEY `c5` (`c5`) @@ -10973,7 +10973,7 @@ m3 CREATE TABLE `m3` ( `c2` char(25) NOT NULL, `c3` int(4) DEFAULT NULL, `c4` char(15) NOT NULL, - `c5` timestamp NOT NULL DEFAULT '0000-00-00 00:00:00', + `c5` timestamp NOT NULL, `c6` decimal(10,8) NOT NULL DEFAULT 3.14159200, PRIMARY KEY (`c4`), UNIQUE KEY `c5` (`c5`) @@ -11353,7 +11353,7 @@ m3 CREATE TABLE `m3` ( `c2` char(25) NOT NULL, `c3` bigint(4) DEFAULT NULL, `c4` char(15) NOT NULL, - `c5` timestamp NOT NULL DEFAULT '0000-00-00 00:00:00', + `c5` timestamp NOT NULL, `c6` decimal(10,8) NOT NULL DEFAULT 3.14159200, PRIMARY KEY (`c4`), UNIQUE KEY `c5` (`c5`) @@ -11733,7 +11733,7 @@ m3 CREATE TABLE `m3` ( `c2` varchar(25) NOT NULL, `c3` tinyint(4) DEFAULT NULL, `c4` varchar(15) NOT NULL, - `c5` timestamp NOT NULL DEFAULT '0000-00-00 00:00:00', + `c5` timestamp NOT NULL, `c6` decimal(10,8) NOT NULL DEFAULT 3.14159200, PRIMARY KEY (`c4`), UNIQUE KEY `c5` (`c5`) @@ -12113,7 +12113,7 @@ m3 CREATE TABLE `m3` ( `c2` varchar(25) NOT NULL, `c3` smallint(4) DEFAULT NULL, `c4` varchar(15) NOT NULL, - `c5` timestamp NOT NULL DEFAULT '0000-00-00 00:00:00', + `c5` timestamp NOT NULL, `c6` decimal(10,8) NOT NULL DEFAULT 3.14159200, PRIMARY KEY (`c4`), UNIQUE KEY `c5` (`c5`) @@ -12493,7 +12493,7 @@ m3 CREATE TABLE `m3` ( `c2` varchar(25) NOT NULL, `c3` mediumint(4) DEFAULT NULL, `c4` varchar(15) NOT NULL, - `c5` timestamp NOT NULL DEFAULT '0000-00-00 00:00:00', + `c5` timestamp NOT NULL, `c6` decimal(10,8) NOT NULL DEFAULT 3.14159200, PRIMARY KEY (`c4`), UNIQUE KEY `c5` (`c5`) @@ -12873,7 +12873,7 @@ m3 CREATE TABLE `m3` ( `c2` varchar(25) NOT NULL, `c3` int(4) DEFAULT NULL, `c4` varchar(15) NOT NULL, - `c5` timestamp NOT NULL DEFAULT '0000-00-00 00:00:00', + `c5` timestamp NOT NULL, `c6` decimal(10,8) NOT NULL DEFAULT 3.14159200, PRIMARY KEY (`c4`), UNIQUE KEY `c5` (`c5`) @@ -13253,7 +13253,7 @@ m3 CREATE TABLE `m3` ( `c2` varchar(25) NOT NULL, `c3` int(4) DEFAULT NULL, `c4` varchar(15) NOT NULL, - `c5` timestamp NOT NULL DEFAULT '0000-00-00 00:00:00', + `c5` timestamp NOT NULL, `c6` decimal(10,8) NOT NULL DEFAULT 3.14159200, PRIMARY KEY (`c4`), UNIQUE KEY `c5` (`c5`) @@ -13633,7 +13633,7 @@ m3 CREATE TABLE `m3` ( `c2` varchar(25) NOT NULL, `c3` bigint(4) DEFAULT NULL, `c4` varchar(15) NOT NULL, - `c5` timestamp NOT NULL DEFAULT '0000-00-00 00:00:00', + `c5` timestamp NOT NULL, `c6` decimal(10,8) NOT NULL DEFAULT 3.14159200, PRIMARY KEY (`c4`), UNIQUE KEY `c5` (`c5`) @@ -14013,7 +14013,7 @@ m3 CREATE TABLE `m3` ( `c2` binary(25) NOT NULL, `c3` tinyint(4) DEFAULT NULL, `c4` binary(15) NOT NULL, - `c5` timestamp NOT NULL DEFAULT '0000-00-00 00:00:00', + `c5` timestamp NOT NULL, `c6` decimal(10,8) NOT NULL DEFAULT 3.14159200, PRIMARY KEY (`c4`), UNIQUE KEY `c5` (`c5`) @@ -14393,7 +14393,7 @@ m3 CREATE TABLE `m3` ( `c2` binary(25) NOT NULL, `c3` smallint(4) DEFAULT NULL, `c4` binary(15) NOT NULL, - `c5` timestamp NOT NULL DEFAULT '0000-00-00 00:00:00', + `c5` timestamp NOT NULL, `c6` decimal(10,8) NOT NULL DEFAULT 3.14159200, PRIMARY KEY (`c4`), UNIQUE KEY `c5` (`c5`) @@ -14773,7 +14773,7 @@ m3 CREATE TABLE `m3` ( `c2` binary(25) NOT NULL, `c3` mediumint(4) DEFAULT NULL, `c4` binary(15) NOT NULL, - `c5` timestamp NOT NULL DEFAULT '0000-00-00 00:00:00', + `c5` timestamp NOT NULL, `c6` decimal(10,8) NOT NULL DEFAULT 3.14159200, PRIMARY KEY (`c4`), UNIQUE KEY `c5` (`c5`) @@ -15153,7 +15153,7 @@ m3 CREATE TABLE `m3` ( `c2` binary(25) NOT NULL, `c3` int(4) DEFAULT NULL, `c4` binary(15) NOT NULL, - `c5` timestamp NOT NULL DEFAULT '0000-00-00 00:00:00', + `c5` timestamp NOT NULL, `c6` decimal(10,8) NOT NULL DEFAULT 3.14159200, PRIMARY KEY (`c4`), UNIQUE KEY `c5` (`c5`) @@ -15533,7 +15533,7 @@ m3 CREATE TABLE `m3` ( `c2` binary(25) NOT NULL, `c3` int(4) DEFAULT NULL, `c4` binary(15) NOT NULL, - `c5` timestamp NOT NULL DEFAULT '0000-00-00 00:00:00', + `c5` timestamp NOT NULL, `c6` decimal(10,8) NOT NULL DEFAULT 3.14159200, PRIMARY KEY (`c4`), UNIQUE KEY `c5` (`c5`) @@ -15913,7 +15913,7 @@ m3 CREATE TABLE `m3` ( `c2` binary(25) NOT NULL, `c3` bigint(4) DEFAULT NULL, `c4` binary(15) NOT NULL, - `c5` timestamp NOT NULL DEFAULT '0000-00-00 00:00:00', + `c5` timestamp NOT NULL, `c6` decimal(10,8) NOT NULL DEFAULT 3.14159200, PRIMARY KEY (`c4`), UNIQUE KEY `c5` (`c5`) @@ -16293,7 +16293,7 @@ m3 CREATE TABLE `m3` ( `c2` varbinary(25) NOT NULL, `c3` tinyint(4) DEFAULT NULL, `c4` varbinary(15) NOT NULL, - `c5` timestamp NOT NULL DEFAULT '0000-00-00 00:00:00', + `c5` timestamp NOT NULL, `c6` decimal(10,8) NOT NULL DEFAULT 3.14159200, PRIMARY KEY (`c4`), UNIQUE KEY `c5` (`c5`) @@ -16673,7 +16673,7 @@ m3 CREATE TABLE `m3` ( `c2` varbinary(25) NOT NULL, `c3` smallint(4) DEFAULT NULL, `c4` varbinary(15) NOT NULL, - `c5` timestamp NOT NULL DEFAULT '0000-00-00 00:00:00', + `c5` timestamp NOT NULL, `c6` decimal(10,8) NOT NULL DEFAULT 3.14159200, PRIMARY KEY (`c4`), UNIQUE KEY `c5` (`c5`) @@ -17053,7 +17053,7 @@ m3 CREATE TABLE `m3` ( `c2` varbinary(25) NOT NULL, `c3` mediumint(4) DEFAULT NULL, `c4` varbinary(15) NOT NULL, - `c5` timestamp NOT NULL DEFAULT '0000-00-00 00:00:00', + `c5` timestamp NOT NULL, `c6` decimal(10,8) NOT NULL DEFAULT 3.14159200, PRIMARY KEY (`c4`), UNIQUE KEY `c5` (`c5`) @@ -17433,7 +17433,7 @@ m3 CREATE TABLE `m3` ( `c2` varbinary(25) NOT NULL, `c3` int(4) DEFAULT NULL, `c4` varbinary(15) NOT NULL, - `c5` timestamp NOT NULL DEFAULT '0000-00-00 00:00:00', + `c5` timestamp NOT NULL, `c6` decimal(10,8) NOT NULL DEFAULT 3.14159200, PRIMARY KEY (`c4`), UNIQUE KEY `c5` (`c5`) @@ -17813,7 +17813,7 @@ m3 CREATE TABLE `m3` ( `c2` varbinary(25) NOT NULL, `c3` int(4) DEFAULT NULL, `c4` varbinary(15) NOT NULL, - `c5` timestamp NOT NULL DEFAULT '0000-00-00 00:00:00', + `c5` timestamp NOT NULL, `c6` decimal(10,8) NOT NULL DEFAULT 3.14159200, PRIMARY KEY (`c4`), UNIQUE KEY `c5` (`c5`) @@ -18193,7 +18193,7 @@ m3 CREATE TABLE `m3` ( `c2` varbinary(25) NOT NULL, `c3` bigint(4) DEFAULT NULL, `c4` varbinary(15) NOT NULL, - `c5` timestamp NOT NULL DEFAULT '0000-00-00 00:00:00', + `c5` timestamp NOT NULL, `c6` decimal(10,8) NOT NULL DEFAULT 3.14159200, PRIMARY KEY (`c4`), UNIQUE KEY `c5` (`c5`) @@ -18573,7 +18573,7 @@ m3 CREATE TABLE `m3` ( `c2` char(25) NOT NULL, `c3` tinyint(4) DEFAULT NULL, `c4` char(15) NOT NULL, - `c5` timestamp NOT NULL DEFAULT '0000-00-00 00:00:00', + `c5` timestamp NOT NULL, `c6` decimal(10,8) NOT NULL DEFAULT 3.14159200, PRIMARY KEY (`c4`), UNIQUE KEY `c5` (`c5`) @@ -18953,7 +18953,7 @@ m3 CREATE TABLE `m3` ( `c2` char(25) NOT NULL, `c3` smallint(4) DEFAULT NULL, `c4` char(15) NOT NULL, - `c5` timestamp NOT NULL DEFAULT '0000-00-00 00:00:00', + `c5` timestamp NOT NULL, `c6` decimal(10,8) NOT NULL DEFAULT 3.14159200, PRIMARY KEY (`c4`), UNIQUE KEY `c5` (`c5`) @@ -19333,7 +19333,7 @@ m3 CREATE TABLE `m3` ( `c2` char(25) NOT NULL, `c3` mediumint(4) DEFAULT NULL, `c4` char(15) NOT NULL, - `c5` timestamp NOT NULL DEFAULT '0000-00-00 00:00:00', + `c5` timestamp NOT NULL, `c6` decimal(10,8) NOT NULL DEFAULT 3.14159200, PRIMARY KEY (`c4`), UNIQUE KEY `c5` (`c5`) @@ -19713,7 +19713,7 @@ m3 CREATE TABLE `m3` ( `c2` char(25) NOT NULL, `c3` int(4) DEFAULT NULL, `c4` char(15) NOT NULL, - `c5` timestamp NOT NULL DEFAULT '0000-00-00 00:00:00', + `c5` timestamp NOT NULL, `c6` decimal(10,8) NOT NULL DEFAULT 3.14159200, PRIMARY KEY (`c4`), UNIQUE KEY `c5` (`c5`) @@ -20093,7 +20093,7 @@ m3 CREATE TABLE `m3` ( `c2` char(25) NOT NULL, `c3` int(4) DEFAULT NULL, `c4` char(15) NOT NULL, - `c5` timestamp NOT NULL DEFAULT '0000-00-00 00:00:00', + `c5` timestamp NOT NULL, `c6` decimal(10,8) NOT NULL DEFAULT 3.14159200, PRIMARY KEY (`c4`), UNIQUE KEY `c5` (`c5`) @@ -20473,7 +20473,7 @@ m3 CREATE TABLE `m3` ( `c2` char(25) NOT NULL, `c3` bigint(4) DEFAULT NULL, `c4` char(15) NOT NULL, - `c5` timestamp NOT NULL DEFAULT '0000-00-00 00:00:00', + `c5` timestamp NOT NULL, `c6` decimal(10,8) NOT NULL DEFAULT 3.14159200, PRIMARY KEY (`c4`), UNIQUE KEY `c5` (`c5`) @@ -20853,7 +20853,7 @@ m3 CREATE TABLE `m3` ( `c2` varchar(25) NOT NULL, `c3` tinyint(4) DEFAULT NULL, `c4` varchar(15) NOT NULL, - `c5` timestamp NOT NULL DEFAULT '0000-00-00 00:00:00', + `c5` timestamp NOT NULL, `c6` decimal(10,8) NOT NULL DEFAULT 3.14159200, PRIMARY KEY (`c4`), UNIQUE KEY `c5` (`c5`) @@ -21233,7 +21233,7 @@ m3 CREATE TABLE `m3` ( `c2` varchar(25) NOT NULL, `c3` smallint(4) DEFAULT NULL, `c4` varchar(15) NOT NULL, - `c5` timestamp NOT NULL DEFAULT '0000-00-00 00:00:00', + `c5` timestamp NOT NULL, `c6` decimal(10,8) NOT NULL DEFAULT 3.14159200, PRIMARY KEY (`c4`), UNIQUE KEY `c5` (`c5`) @@ -21613,7 +21613,7 @@ m3 CREATE TABLE `m3` ( `c2` varchar(25) NOT NULL, `c3` mediumint(4) DEFAULT NULL, `c4` varchar(15) NOT NULL, - `c5` timestamp NOT NULL DEFAULT '0000-00-00 00:00:00', + `c5` timestamp NOT NULL, `c6` decimal(10,8) NOT NULL DEFAULT 3.14159200, PRIMARY KEY (`c4`), UNIQUE KEY `c5` (`c5`) @@ -21993,7 +21993,7 @@ m3 CREATE TABLE `m3` ( `c2` varchar(25) NOT NULL, `c3` int(4) DEFAULT NULL, `c4` varchar(15) NOT NULL, - `c5` timestamp NOT NULL DEFAULT '0000-00-00 00:00:00', + `c5` timestamp NOT NULL, `c6` decimal(10,8) NOT NULL DEFAULT 3.14159200, PRIMARY KEY (`c4`), UNIQUE KEY `c5` (`c5`) @@ -22373,7 +22373,7 @@ m3 CREATE TABLE `m3` ( `c2` varchar(25) NOT NULL, `c3` int(4) DEFAULT NULL, `c4` varchar(15) NOT NULL, - `c5` timestamp NOT NULL DEFAULT '0000-00-00 00:00:00', + `c5` timestamp NOT NULL, `c6` decimal(10,8) NOT NULL DEFAULT 3.14159200, PRIMARY KEY (`c4`), UNIQUE KEY `c5` (`c5`) @@ -22753,7 +22753,7 @@ m3 CREATE TABLE `m3` ( `c2` varchar(25) NOT NULL, `c3` bigint(4) DEFAULT NULL, `c4` varchar(15) NOT NULL, - `c5` timestamp NOT NULL DEFAULT '0000-00-00 00:00:00', + `c5` timestamp NOT NULL, `c6` decimal(10,8) NOT NULL DEFAULT 3.14159200, PRIMARY KEY (`c4`), UNIQUE KEY `c5` (`c5`) @@ -23133,7 +23133,7 @@ m3 CREATE TABLE `m3` ( `c2` binary(25) NOT NULL, `c3` tinyint(4) DEFAULT NULL, `c4` binary(15) NOT NULL, - `c5` timestamp NOT NULL DEFAULT '0000-00-00 00:00:00', + `c5` timestamp NOT NULL, `c6` decimal(10,8) NOT NULL DEFAULT 3.14159200, PRIMARY KEY (`c4`), UNIQUE KEY `c5` (`c5`) @@ -23513,7 +23513,7 @@ m3 CREATE TABLE `m3` ( `c2` binary(25) NOT NULL, `c3` smallint(4) DEFAULT NULL, `c4` binary(15) NOT NULL, - `c5` timestamp NOT NULL DEFAULT '0000-00-00 00:00:00', + `c5` timestamp NOT NULL, `c6` decimal(10,8) NOT NULL DEFAULT 3.14159200, PRIMARY KEY (`c4`), UNIQUE KEY `c5` (`c5`) @@ -23893,7 +23893,7 @@ m3 CREATE TABLE `m3` ( `c2` binary(25) NOT NULL, `c3` mediumint(4) DEFAULT NULL, `c4` binary(15) NOT NULL, - `c5` timestamp NOT NULL DEFAULT '0000-00-00 00:00:00', + `c5` timestamp NOT NULL, `c6` decimal(10,8) NOT NULL DEFAULT 3.14159200, PRIMARY KEY (`c4`), UNIQUE KEY `c5` (`c5`) @@ -24273,7 +24273,7 @@ m3 CREATE TABLE `m3` ( `c2` binary(25) NOT NULL, `c3` int(4) DEFAULT NULL, `c4` binary(15) NOT NULL, - `c5` timestamp NOT NULL DEFAULT '0000-00-00 00:00:00', + `c5` timestamp NOT NULL, `c6` decimal(10,8) NOT NULL DEFAULT 3.14159200, PRIMARY KEY (`c4`), UNIQUE KEY `c5` (`c5`) @@ -24653,7 +24653,7 @@ m3 CREATE TABLE `m3` ( `c2` binary(25) NOT NULL, `c3` int(4) DEFAULT NULL, `c4` binary(15) NOT NULL, - `c5` timestamp NOT NULL DEFAULT '0000-00-00 00:00:00', + `c5` timestamp NOT NULL, `c6` decimal(10,8) NOT NULL DEFAULT 3.14159200, PRIMARY KEY (`c4`), UNIQUE KEY `c5` (`c5`) @@ -25033,7 +25033,7 @@ m3 CREATE TABLE `m3` ( `c2` binary(25) NOT NULL, `c3` bigint(4) DEFAULT NULL, `c4` binary(15) NOT NULL, - `c5` timestamp NOT NULL DEFAULT '0000-00-00 00:00:00', + `c5` timestamp NOT NULL, `c6` decimal(10,8) NOT NULL DEFAULT 3.14159200, PRIMARY KEY (`c4`), UNIQUE KEY `c5` (`c5`) @@ -25413,7 +25413,7 @@ m3 CREATE TABLE `m3` ( `c2` varbinary(25) NOT NULL, `c3` tinyint(4) DEFAULT NULL, `c4` varbinary(15) NOT NULL, - `c5` timestamp NOT NULL DEFAULT '0000-00-00 00:00:00', + `c5` timestamp NOT NULL, `c6` decimal(10,8) NOT NULL DEFAULT 3.14159200, PRIMARY KEY (`c4`), UNIQUE KEY `c5` (`c5`) @@ -25793,7 +25793,7 @@ m3 CREATE TABLE `m3` ( `c2` varbinary(25) NOT NULL, `c3` smallint(4) DEFAULT NULL, `c4` varbinary(15) NOT NULL, - `c5` timestamp NOT NULL DEFAULT '0000-00-00 00:00:00', + `c5` timestamp NOT NULL, `c6` decimal(10,8) NOT NULL DEFAULT 3.14159200, PRIMARY KEY (`c4`), UNIQUE KEY `c5` (`c5`) @@ -26173,7 +26173,7 @@ m3 CREATE TABLE `m3` ( `c2` varbinary(25) NOT NULL, `c3` mediumint(4) DEFAULT NULL, `c4` varbinary(15) NOT NULL, - `c5` timestamp NOT NULL DEFAULT '0000-00-00 00:00:00', + `c5` timestamp NOT NULL, `c6` decimal(10,8) NOT NULL DEFAULT 3.14159200, PRIMARY KEY (`c4`), UNIQUE KEY `c5` (`c5`) @@ -26553,7 +26553,7 @@ m3 CREATE TABLE `m3` ( `c2` varbinary(25) NOT NULL, `c3` int(4) DEFAULT NULL, `c4` varbinary(15) NOT NULL, - `c5` timestamp NOT NULL DEFAULT '0000-00-00 00:00:00', + `c5` timestamp NOT NULL, `c6` decimal(10,8) NOT NULL DEFAULT 3.14159200, PRIMARY KEY (`c4`), UNIQUE KEY `c5` (`c5`) @@ -26933,7 +26933,7 @@ m3 CREATE TABLE `m3` ( `c2` varbinary(25) NOT NULL, `c3` int(4) DEFAULT NULL, `c4` varbinary(15) NOT NULL, - `c5` timestamp NOT NULL DEFAULT '0000-00-00 00:00:00', + `c5` timestamp NOT NULL, `c6` decimal(10,8) NOT NULL DEFAULT 3.14159200, PRIMARY KEY (`c4`), UNIQUE KEY `c5` (`c5`) @@ -27313,7 +27313,7 @@ m3 CREATE TABLE `m3` ( `c2` varbinary(25) NOT NULL, `c3` bigint(4) DEFAULT NULL, `c4` varbinary(15) NOT NULL, - `c5` timestamp NOT NULL DEFAULT '0000-00-00 00:00:00', + `c5` timestamp NOT NULL, `c6` decimal(10,8) NOT NULL DEFAULT 3.14159200, PRIMARY KEY (`c4`), UNIQUE KEY `c5` (`c5`) @@ -27693,7 +27693,7 @@ m3 CREATE TABLE `m3` ( `c2` char(25) NOT NULL, `c3` tinyint(4) DEFAULT NULL, `c4` char(15) NOT NULL, - `c5` timestamp NOT NULL DEFAULT '0000-00-00 00:00:00', + `c5` timestamp NOT NULL, `c6` decimal(10,8) NOT NULL DEFAULT 3.14159200, PRIMARY KEY (`c4`), UNIQUE KEY `c5` (`c5`) @@ -28073,7 +28073,7 @@ m3 CREATE TABLE `m3` ( `c2` char(25) NOT NULL, `c3` smallint(4) DEFAULT NULL, `c4` char(15) NOT NULL, - `c5` timestamp NOT NULL DEFAULT '0000-00-00 00:00:00', + `c5` timestamp NOT NULL, `c6` decimal(10,8) NOT NULL DEFAULT 3.14159200, PRIMARY KEY (`c4`), UNIQUE KEY `c5` (`c5`) @@ -28453,7 +28453,7 @@ m3 CREATE TABLE `m3` ( `c2` char(25) NOT NULL, `c3` mediumint(4) DEFAULT NULL, `c4` char(15) NOT NULL, - `c5` timestamp NOT NULL DEFAULT '0000-00-00 00:00:00', + `c5` timestamp NOT NULL, `c6` decimal(10,8) NOT NULL DEFAULT 3.14159200, PRIMARY KEY (`c4`), UNIQUE KEY `c5` (`c5`) @@ -28833,7 +28833,7 @@ m3 CREATE TABLE `m3` ( `c2` char(25) NOT NULL, `c3` int(4) DEFAULT NULL, `c4` char(15) NOT NULL, - `c5` timestamp NOT NULL DEFAULT '0000-00-00 00:00:00', + `c5` timestamp NOT NULL, `c6` decimal(10,8) NOT NULL DEFAULT 3.14159200, PRIMARY KEY (`c4`), UNIQUE KEY `c5` (`c5`) @@ -29213,7 +29213,7 @@ m3 CREATE TABLE `m3` ( `c2` char(25) NOT NULL, `c3` int(4) DEFAULT NULL, `c4` char(15) NOT NULL, - `c5` timestamp NOT NULL DEFAULT '0000-00-00 00:00:00', + `c5` timestamp NOT NULL, `c6` decimal(10,8) NOT NULL DEFAULT 3.14159200, PRIMARY KEY (`c4`), UNIQUE KEY `c5` (`c5`) @@ -29593,7 +29593,7 @@ m3 CREATE TABLE `m3` ( `c2` char(25) NOT NULL, `c3` bigint(4) DEFAULT NULL, `c4` char(15) NOT NULL, - `c5` timestamp NOT NULL DEFAULT '0000-00-00 00:00:00', + `c5` timestamp NOT NULL, `c6` decimal(10,8) NOT NULL DEFAULT 3.14159200, PRIMARY KEY (`c4`), UNIQUE KEY `c5` (`c5`) @@ -29973,7 +29973,7 @@ m3 CREATE TABLE `m3` ( `c2` varchar(25) NOT NULL, `c3` tinyint(4) DEFAULT NULL, `c4` varchar(15) NOT NULL, - `c5` timestamp NOT NULL DEFAULT '0000-00-00 00:00:00', + `c5` timestamp NOT NULL, `c6` decimal(10,8) NOT NULL DEFAULT 3.14159200, PRIMARY KEY (`c4`), UNIQUE KEY `c5` (`c5`) @@ -30353,7 +30353,7 @@ m3 CREATE TABLE `m3` ( `c2` varchar(25) NOT NULL, `c3` smallint(4) DEFAULT NULL, `c4` varchar(15) NOT NULL, - `c5` timestamp NOT NULL DEFAULT '0000-00-00 00:00:00', + `c5` timestamp NOT NULL, `c6` decimal(10,8) NOT NULL DEFAULT 3.14159200, PRIMARY KEY (`c4`), UNIQUE KEY `c5` (`c5`) @@ -30733,7 +30733,7 @@ m3 CREATE TABLE `m3` ( `c2` varchar(25) NOT NULL, `c3` mediumint(4) DEFAULT NULL, `c4` varchar(15) NOT NULL, - `c5` timestamp NOT NULL DEFAULT '0000-00-00 00:00:00', + `c5` timestamp NOT NULL, `c6` decimal(10,8) NOT NULL DEFAULT 3.14159200, PRIMARY KEY (`c4`), UNIQUE KEY `c5` (`c5`) @@ -31113,7 +31113,7 @@ m3 CREATE TABLE `m3` ( `c2` varchar(25) NOT NULL, `c3` int(4) DEFAULT NULL, `c4` varchar(15) NOT NULL, - `c5` timestamp NOT NULL DEFAULT '0000-00-00 00:00:00', + `c5` timestamp NOT NULL, `c6` decimal(10,8) NOT NULL DEFAULT 3.14159200, PRIMARY KEY (`c4`), UNIQUE KEY `c5` (`c5`) @@ -31493,7 +31493,7 @@ m3 CREATE TABLE `m3` ( `c2` varchar(25) NOT NULL, `c3` int(4) DEFAULT NULL, `c4` varchar(15) NOT NULL, - `c5` timestamp NOT NULL DEFAULT '0000-00-00 00:00:00', + `c5` timestamp NOT NULL, `c6` decimal(10,8) NOT NULL DEFAULT 3.14159200, PRIMARY KEY (`c4`), UNIQUE KEY `c5` (`c5`) @@ -31873,7 +31873,7 @@ m3 CREATE TABLE `m3` ( `c2` varchar(25) NOT NULL, `c3` bigint(4) DEFAULT NULL, `c4` varchar(15) NOT NULL, - `c5` timestamp NOT NULL DEFAULT '0000-00-00 00:00:00', + `c5` timestamp NOT NULL, `c6` decimal(10,8) NOT NULL DEFAULT 3.14159200, PRIMARY KEY (`c4`), UNIQUE KEY `c5` (`c5`) @@ -32253,7 +32253,7 @@ m3 CREATE TABLE `m3` ( `c2` binary(25) NOT NULL, `c3` tinyint(4) DEFAULT NULL, `c4` binary(15) NOT NULL, - `c5` timestamp NOT NULL DEFAULT '0000-00-00 00:00:00', + `c5` timestamp NOT NULL, `c6` decimal(10,8) NOT NULL DEFAULT 3.14159200, PRIMARY KEY (`c4`), UNIQUE KEY `c5` (`c5`) @@ -32633,7 +32633,7 @@ m3 CREATE TABLE `m3` ( `c2` binary(25) NOT NULL, `c3` smallint(4) DEFAULT NULL, `c4` binary(15) NOT NULL, - `c5` timestamp NOT NULL DEFAULT '0000-00-00 00:00:00', + `c5` timestamp NOT NULL, `c6` decimal(10,8) NOT NULL DEFAULT 3.14159200, PRIMARY KEY (`c4`), UNIQUE KEY `c5` (`c5`) @@ -33013,7 +33013,7 @@ m3 CREATE TABLE `m3` ( `c2` binary(25) NOT NULL, `c3` mediumint(4) DEFAULT NULL, `c4` binary(15) NOT NULL, - `c5` timestamp NOT NULL DEFAULT '0000-00-00 00:00:00', + `c5` timestamp NOT NULL, `c6` decimal(10,8) NOT NULL DEFAULT 3.14159200, PRIMARY KEY (`c4`), UNIQUE KEY `c5` (`c5`) @@ -33393,7 +33393,7 @@ m3 CREATE TABLE `m3` ( `c2` binary(25) NOT NULL, `c3` int(4) DEFAULT NULL, `c4` binary(15) NOT NULL, - `c5` timestamp NOT NULL DEFAULT '0000-00-00 00:00:00', + `c5` timestamp NOT NULL, `c6` decimal(10,8) NOT NULL DEFAULT 3.14159200, PRIMARY KEY (`c4`), UNIQUE KEY `c5` (`c5`) @@ -33773,7 +33773,7 @@ m3 CREATE TABLE `m3` ( `c2` binary(25) NOT NULL, `c3` int(4) DEFAULT NULL, `c4` binary(15) NOT NULL, - `c5` timestamp NOT NULL DEFAULT '0000-00-00 00:00:00', + `c5` timestamp NOT NULL, `c6` decimal(10,8) NOT NULL DEFAULT 3.14159200, PRIMARY KEY (`c4`), UNIQUE KEY `c5` (`c5`) @@ -34153,7 +34153,7 @@ m3 CREATE TABLE `m3` ( `c2` binary(25) NOT NULL, `c3` bigint(4) DEFAULT NULL, `c4` binary(15) NOT NULL, - `c5` timestamp NOT NULL DEFAULT '0000-00-00 00:00:00', + `c5` timestamp NOT NULL, `c6` decimal(10,8) NOT NULL DEFAULT 3.14159200, PRIMARY KEY (`c4`), UNIQUE KEY `c5` (`c5`) @@ -34533,7 +34533,7 @@ m3 CREATE TABLE `m3` ( `c2` varbinary(25) NOT NULL, `c3` tinyint(4) DEFAULT NULL, `c4` varbinary(15) NOT NULL, - `c5` timestamp NOT NULL DEFAULT '0000-00-00 00:00:00', + `c5` timestamp NOT NULL, `c6` decimal(10,8) NOT NULL DEFAULT 3.14159200, PRIMARY KEY (`c4`), UNIQUE KEY `c5` (`c5`) @@ -34913,7 +34913,7 @@ m3 CREATE TABLE `m3` ( `c2` varbinary(25) NOT NULL, `c3` smallint(4) DEFAULT NULL, `c4` varbinary(15) NOT NULL, - `c5` timestamp NOT NULL DEFAULT '0000-00-00 00:00:00', + `c5` timestamp NOT NULL, `c6` decimal(10,8) NOT NULL DEFAULT 3.14159200, PRIMARY KEY (`c4`), UNIQUE KEY `c5` (`c5`) @@ -35293,7 +35293,7 @@ m3 CREATE TABLE `m3` ( `c2` varbinary(25) NOT NULL, `c3` mediumint(4) DEFAULT NULL, `c4` varbinary(15) NOT NULL, - `c5` timestamp NOT NULL DEFAULT '0000-00-00 00:00:00', + `c5` timestamp NOT NULL, `c6` decimal(10,8) NOT NULL DEFAULT 3.14159200, PRIMARY KEY (`c4`), UNIQUE KEY `c5` (`c5`) @@ -35673,7 +35673,7 @@ m3 CREATE TABLE `m3` ( `c2` varbinary(25) NOT NULL, `c3` int(4) DEFAULT NULL, `c4` varbinary(15) NOT NULL, - `c5` timestamp NOT NULL DEFAULT '0000-00-00 00:00:00', + `c5` timestamp NOT NULL, `c6` decimal(10,8) NOT NULL DEFAULT 3.14159200, PRIMARY KEY (`c4`), UNIQUE KEY `c5` (`c5`) @@ -36053,7 +36053,7 @@ m3 CREATE TABLE `m3` ( `c2` varbinary(25) NOT NULL, `c3` int(4) DEFAULT NULL, `c4` varbinary(15) NOT NULL, - `c5` timestamp NOT NULL DEFAULT '0000-00-00 00:00:00', + `c5` timestamp NOT NULL, `c6` decimal(10,8) NOT NULL DEFAULT 3.14159200, PRIMARY KEY (`c4`), UNIQUE KEY `c5` (`c5`) @@ -36433,7 +36433,7 @@ m3 CREATE TABLE `m3` ( `c2` varbinary(25) NOT NULL, `c3` bigint(4) DEFAULT NULL, `c4` varbinary(15) NOT NULL, - `c5` timestamp NOT NULL DEFAULT '0000-00-00 00:00:00', + `c5` timestamp NOT NULL, `c6` decimal(10,8) NOT NULL DEFAULT 3.14159200, PRIMARY KEY (`c4`), UNIQUE KEY `c5` (`c5`) diff --git a/mysql-test/suite/engines/funcs/r/tc_multicolumn_same.result b/mysql-test/suite/engines/funcs/r/tc_multicolumn_same.result index e91c3139d37..d7f3e83c51b 100644 --- a/mysql-test/suite/engines/funcs/r/tc_multicolumn_same.result +++ b/mysql-test/suite/engines/funcs/r/tc_multicolumn_same.result @@ -313,10 +313,10 @@ SHOW CREATE TABLE m1; Table Create Table m1 CREATE TABLE `m1` ( `c1` timestamp NULL DEFAULT NULL, - `c2` timestamp NOT NULL DEFAULT '0000-00-00 00:00:00', + `c2` timestamp NOT NULL, `c3` timestamp NULL DEFAULT NULL, - `c4` timestamp NOT NULL DEFAULT '0000-00-00 00:00:00', - `c5` timestamp NOT NULL DEFAULT '0000-00-00 00:00:00', + `c4` timestamp NOT NULL, + `c5` timestamp NOT NULL, PRIMARY KEY (`c4`), UNIQUE KEY `c5` (`c5`) ) ENGINE=ENGINE DEFAULT CHARSET=latin1 diff --git a/mysql-test/suite/engines/funcs/r/tc_temporary_column.result b/mysql-test/suite/engines/funcs/r/tc_temporary_column.result index d2e5152070c..74dda4eeaba 100644 --- a/mysql-test/suite/engines/funcs/r/tc_temporary_column.result +++ b/mysql-test/suite/engines/funcs/r/tc_temporary_column.result @@ -500,7 +500,7 @@ Tables_in_test SHOW CREATE TABLE t1; Table Create Table t1 CREATE TEMPORARY TABLE `t1` ( - `c1` timestamp NOT NULL DEFAULT current_timestamp() ON UPDATE current_timestamp() + `c1` timestamp NOT NULL ) ENGINE=ENGINE DEFAULT CHARSET=latin1 DROP TABLE t1; SHOW TABLES; diff --git a/mysql-test/suite/federated/federatedx_versioning.test b/mysql-test/suite/federated/federatedx_versioning.test index 6c3247cea55..4d2f2d35139 100644 --- a/mysql-test/suite/federated/federatedx_versioning.test +++ b/mysql-test/suite/federated/federatedx_versioning.test @@ -12,7 +12,7 @@ eval create or replace table t1 ( with system versioning; --replace_result $MASTER_MYPORT MASTER_MYPORT eval create or replace table tf engine=FEDERATED connection='mysql://root@127.0.0.1:$MASTER_MYPORT/test/t1'; ---replace_result $MASTER_MYPORT MASTER_MYPORT $sys_datatype_expl SYS_TYPE 19710101000000 "'1971-01-01 00:00:00.000000'" " NOT NULL" "" +--replace_result $MASTER_MYPORT MASTER_MYPORT $sys_datatype_expl SYS_TYPE 19710101000000 "'1971-01-01 00:00:00.000000'" "NOT NULL " "" show create table tf; --echo # INSERT insert into t1 values (1); diff --git a/mysql-test/suite/galera/r/galera_gra_log.result b/mysql-test/suite/galera/r/galera_gra_log.result index 8ac76692262..4146192bb55 100644 --- a/mysql-test/suite/galera/r/galera_gra_log.result +++ b/mysql-test/suite/galera/r/galera_gra_log.result @@ -18,7 +18,7 @@ ROLLBACK/*!*/; use `test`/*!*/; SET TIMESTAMP=<TIMESTAMP>/*!*/; SET @@session.pseudo_thread_id=<PSEUDO_THREAD_ID>/*!*/; -SET @@session.foreign_key_checks=1, @@session.sql_auto_is_null=0, @@session.unique_checks=1, @@session.autocommit=1, @@session.check_constraint_checks=1, @@session.sql_if_exists=0, @@session.explicit_defaults_for_timestamp=0/*!*/; +SET @@session.foreign_key_checks=1, @@session.sql_auto_is_null=0, @@session.unique_checks=1, @@session.autocommit=1, @@session.check_constraint_checks=1, @@session.sql_if_exists=0, @@session.explicit_defaults_for_timestamp=1/*!*/; SET @@session.sql_mode=1411383296/*!*/; SET @@session.auto_increment_increment=1, @@session.auto_increment_offset=1/*!*/; /*!\C latin1 *//*!*/; diff --git a/mysql-test/suite/gcol/r/gcol_supported_sql_funcs_innodb.result b/mysql-test/suite/gcol/r/gcol_supported_sql_funcs_innodb.result index 8a772fbf34f..4c5e4e76b89 100644 --- a/mysql-test/suite/gcol/r/gcol_supported_sql_funcs_innodb.result +++ b/mysql-test/suite/gcol/r/gcol_supported_sql_funcs_innodb.result @@ -2599,7 +2599,7 @@ create table t1 (a timestamp, c bigint generated always as (timestampdiff(MONTH, show create table t1; Table Create Table t1 CREATE TABLE `t1` ( - `a` timestamp NOT NULL DEFAULT current_timestamp() ON UPDATE current_timestamp(), + `a` timestamp NULL DEFAULT NULL, `c` bigint(20) GENERATED ALWAYS AS (timestampdiff(MONTH,`a`,`a`)) VIRTUAL ) ENGINE=InnoDB DEFAULT CHARSET=latin1 insert into t1 values ('2003-02-01',default); diff --git a/mysql-test/suite/gcol/r/gcol_supported_sql_funcs_myisam.result b/mysql-test/suite/gcol/r/gcol_supported_sql_funcs_myisam.result index 2bf8dce3f1c..7570451fb24 100644 --- a/mysql-test/suite/gcol/r/gcol_supported_sql_funcs_myisam.result +++ b/mysql-test/suite/gcol/r/gcol_supported_sql_funcs_myisam.result @@ -2599,7 +2599,7 @@ create table t1 (a timestamp, c bigint generated always as (timestampdiff(MONTH, show create table t1; Table Create Table t1 CREATE TABLE `t1` ( - `a` timestamp NOT NULL DEFAULT current_timestamp() ON UPDATE current_timestamp(), + `a` timestamp NULL DEFAULT NULL, `c` bigint(20) GENERATED ALWAYS AS (timestampdiff(MONTH,`a`,`a`)) VIRTUAL ) ENGINE=MyISAM DEFAULT CHARSET=latin1 insert into t1 values ('2003-02-01',default); diff --git a/mysql-test/suite/gcol/r/innodb_virtual_fk.result b/mysql-test/suite/gcol/r/innodb_virtual_fk.result index 8e6ec857602..c35f10ca521 100644 --- a/mysql-test/suite/gcol/r/innodb_virtual_fk.result +++ b/mysql-test/suite/gcol/r/innodb_virtual_fk.result @@ -712,7 +712,7 @@ SET foreign_key_checks=1; SHOW CREATE TABLE t1; Table Create Table t1 CREATE TABLE `t1` ( - `c1` timestamp NOT NULL DEFAULT current_timestamp() ON UPDATE current_timestamp(), + `c1` timestamp NULL DEFAULT NULL, `c2` year(4) DEFAULT NULL, `c3` time DEFAULT NULL, `c4` char(10) DEFAULT NULL, @@ -729,7 +729,7 @@ ERROR HY000: Can't create table `test`.`t1` (errno: 150 "Foreign key constraint SHOW CREATE TABLE t1; Table Create Table t1 CREATE TABLE `t1` ( - `c1` timestamp NOT NULL DEFAULT current_timestamp() ON UPDATE current_timestamp(), + `c1` timestamp NULL DEFAULT NULL, `c2` year(4) DEFAULT NULL, `c3` time DEFAULT NULL, `c4` char(10) DEFAULT NULL, diff --git a/mysql-test/suite/innodb/r/innodb-alter-timestamp.result b/mysql-test/suite/innodb/r/innodb-alter-timestamp.result index 5e95429c7bf..cbdf5cd828b 100644 --- a/mysql-test/suite/innodb/r/innodb-alter-timestamp.result +++ b/mysql-test/suite/innodb/r/innodb-alter-timestamp.result @@ -59,16 +59,11 @@ SELECT DISTINCT d1 FROM t1; d1 NULL ALTER TABLE t1 CHANGE d1 d1 TIMESTAMP DEFAULT '2017-05-08 16:32:54'; -affected rows: 5 -info: Records: 5 Duplicates: 0 Warnings: 0 -# Note: NULL was changed to CURRENT_TIMESTAMP(), -# not the specified constant DEFAULT value! +affected rows: 0 +info: Records: 0 Duplicates: 0 Warnings: 0 SELECT COUNT(DISTINCT d1),COUNT(d1),COUNT(*) FROM t1; COUNT(DISTINCT d1) COUNT(d1) COUNT(*) -1 5 5 -SELECT DISTINCT (CURRENT_TIMESTAMP()-d1) <= 60 FROM t1; -(CURRENT_TIMESTAMP()-d1) <= 60 -1 +0 0 5 drop table t1; CREATE TABLE t1 ( `i1` INT(10) UNSIGNED NOT NULL, @@ -111,8 +106,8 @@ t1 CREATE TABLE `t1` ( `i1` int(10) unsigned NOT NULL, `d1` timestamp NOT NULL DEFAULT current_timestamp(), `u1` varchar(30) DEFAULT substr(user(),1), - `d2` timestamp NOT NULL DEFAULT '2017-05-08 16:23:45', - `d3` timestamp NOT NULL DEFAULT `d1` + `d2` timestamp NULL DEFAULT '2017-05-08 16:23:45', + `d3` timestamp NULL DEFAULT `d1` ) ENGINE=InnoDB DEFAULT CHARSET=latin1 ALTER TABLE t1 ADD COLUMN d4 TIMESTAMP DEFAULT CURRENT_TIMESTAMP; affected rows: 0 diff --git a/mysql-test/suite/innodb/r/instant_alter_debug.result b/mysql-test/suite/innodb/r/instant_alter_debug.result index 5f74c234260..7205fc48b50 100644 --- a/mysql-test/suite/innodb/r/instant_alter_debug.result +++ b/mysql-test/suite/innodb/r/instant_alter_debug.result @@ -78,9 +78,7 @@ c7 VARCHAR(257) CHARACTER SET latin1, c8 VARCHAR(257) CHARACTER SET binary ) ENGINE=InnoDB; INSERT INTO t9 () VALUES (); -ALTER TABLE t9 ADD COLUMN IF NOT EXISTS t TIMESTAMP NULL KEY; -Warnings: -Note 1061 Multiple primary key defined +ALTER TABLE t9 ADD COLUMN IF NOT EXISTS t TIMESTAMP NULL; SET DEBUG_SYNC='row_log_table_apply1_before SIGNAL rebuilt WAIT_FOR dml'; OPTIMIZE TABLE t9; connection dml; diff --git a/mysql-test/suite/innodb/t/innodb-alter-timestamp.test b/mysql-test/suite/innodb/t/innodb-alter-timestamp.test index e1c263dc5d0..95df8d6b649 100644 --- a/mysql-test/suite/innodb/t/innodb-alter-timestamp.test +++ b/mysql-test/suite/innodb/t/innodb-alter-timestamp.test @@ -48,10 +48,7 @@ SELECT DISTINCT d1 FROM t1; --enable_info ALTER TABLE t1 CHANGE d1 d1 TIMESTAMP DEFAULT '2017-05-08 16:32:54'; --disable_info ---echo # Note: NULL was changed to CURRENT_TIMESTAMP(), ---echo # not the specified constant DEFAULT value! SELECT COUNT(DISTINCT d1),COUNT(d1),COUNT(*) FROM t1; -SELECT DISTINCT (CURRENT_TIMESTAMP()-d1) <= 60 FROM t1; drop table t1; CREATE TABLE t1 ( diff --git a/mysql-test/suite/innodb/t/instant_alter_debug.test b/mysql-test/suite/innodb/t/instant_alter_debug.test index c6eca884907..64f94a78f2e 100644 --- a/mysql-test/suite/innodb/t/instant_alter_debug.test +++ b/mysql-test/suite/innodb/t/instant_alter_debug.test @@ -91,7 +91,7 @@ CREATE TABLE t9 ( c8 VARCHAR(257) CHARACTER SET binary ) ENGINE=InnoDB; INSERT INTO t9 () VALUES (); -ALTER TABLE t9 ADD COLUMN IF NOT EXISTS t TIMESTAMP NULL KEY; +ALTER TABLE t9 ADD COLUMN IF NOT EXISTS t TIMESTAMP NULL; SET DEBUG_SYNC='row_log_table_apply1_before SIGNAL rebuilt WAIT_FOR dml'; --send OPTIMIZE TABLE t9; diff --git a/mysql-test/suite/parts/r/rpl_partition.result b/mysql-test/suite/parts/r/rpl_partition.result index 41df816fcc0..6aaded5a425 100644 --- a/mysql-test/suite/parts/r/rpl_partition.result +++ b/mysql-test/suite/parts/r/rpl_partition.result @@ -128,7 +128,7 @@ show create table t3; Table t3 Create Table CREATE TABLE `t3` ( `id` mediumint(9) NOT NULL AUTO_INCREMENT, - `dt` timestamp NOT NULL DEFAULT current_timestamp() ON UPDATE current_timestamp(), + `dt` timestamp NULL DEFAULT NULL, `user` char(255) DEFAULT NULL, `uuidf` longblob DEFAULT NULL, `fkid` mediumint(9) DEFAULT NULL, diff --git a/mysql-test/suite/period/r/create.result b/mysql-test/suite/period/r/create.result index 69d7e918804..57ec96793ff 100644 --- a/mysql-test/suite/period/r/create.result +++ b/mysql-test/suite/period/r/create.result @@ -16,8 +16,8 @@ show create table t; Table Create Table t CREATE TABLE `t` ( `id` int(11) NOT NULL, - `s` timestamp(6) NOT NULL DEFAULT '0000-00-00 00:00:00.000000', - `e` timestamp(6) NOT NULL DEFAULT '0000-00-00 00:00:00.000000', + `s` timestamp(6) NOT NULL, + `e` timestamp(6) NOT NULL, PERIOD FOR `mytime` (`s`, `e`), PRIMARY KEY (`id`) ) ENGINE=MyISAM DEFAULT CHARSET=latin1 diff --git a/mysql-test/suite/plugins/r/test_sql_service.result b/mysql-test/suite/plugins/r/test_sql_service.result index ca7326de51c..a68980bd021 100644 --- a/mysql-test/suite/plugins/r/test_sql_service.result +++ b/mysql-test/suite/plugins/r/test_sql_service.result @@ -66,7 +66,7 @@ set global test_sql_service_execute_sql_global= 'drop table test.t1'; show status like 'test_sql_query_result'; Variable_name Value Test_sql_query_result Error 1051 returned. Unknown table 'test.t1' -create table t1 (id int, time timestamp); +create table t1 (id int, time timestamp not null default now()); insert into t1 values (1, NULL), (2, NULL), (3, NULL), (4, NULL), (5, NULL); set global test_sql_service_execute_sql_global= 'select * FROM test.t1 WHERE time < DATE_SUB(NOW(), interval 5 minute)'; show status like 'test_sql_query_result'; diff --git a/mysql-test/suite/plugins/t/test_sql_service.test b/mysql-test/suite/plugins/t/test_sql_service.test index 3f2aaa81c4c..078992acdb4 100644 --- a/mysql-test/suite/plugins/t/test_sql_service.test +++ b/mysql-test/suite/plugins/t/test_sql_service.test @@ -59,7 +59,7 @@ show status like 'test_sql_query_result'; set global test_sql_service_execute_sql_global= 'drop table test.t1'; show status like 'test_sql_query_result'; -create table t1 (id int, time timestamp); +create table t1 (id int, time timestamp not null default now()); insert into t1 values (1, NULL), (2, NULL), (3, NULL), (4, NULL), (5, NULL); set global test_sql_service_execute_sql_global= 'select * FROM test.t1 WHERE time < DATE_SUB(NOW(), interval 5 minute)'; show status like 'test_sql_query_result'; diff --git a/mysql-test/suite/rpl/r/rpl_blackhole_row_annotate.result b/mysql-test/suite/rpl/r/rpl_blackhole_row_annotate.result index 53420891754..2c602ea53aa 100644 --- a/mysql-test/suite/rpl/r/rpl_blackhole_row_annotate.result +++ b/mysql-test/suite/rpl/r/rpl_blackhole_row_annotate.result @@ -200,7 +200,7 @@ ROLLBACK/*!*/; use `test`/*!*/; SET TIMESTAMP=1000000000/*!*/; SET @@session.pseudo_thread_id=#/*!*/; -SET @@session.foreign_key_checks=1, @@session.sql_auto_is_null=0, @@session.unique_checks=1, @@session.autocommit=1, @@session.check_constraint_checks=1, @@session.sql_if_exists=0, @@session.explicit_defaults_for_timestamp=0/*!*/; +SET @@session.foreign_key_checks=1, @@session.sql_auto_is_null=0, @@session.unique_checks=1, @@session.autocommit=1, @@session.check_constraint_checks=1, @@session.sql_if_exists=0, @@session.explicit_defaults_for_timestamp=1/*!*/; SET @@session.sql_mode=1411383296/*!*/; SET @@session.auto_increment_increment=1, @@session.auto_increment_offset=1/*!*/; /*!\C latin1 *//*!*/; diff --git a/mysql-test/suite/rpl/r/rpl_hrtime.result b/mysql-test/suite/rpl/r/rpl_hrtime.result index 5f0b8f4123a..230029d9119 100644 --- a/mysql-test/suite/rpl/r/rpl_hrtime.result +++ b/mysql-test/suite/rpl/r/rpl_hrtime.result @@ -37,7 +37,7 @@ ROLLBACK/*!*/; use `test`/*!*/; SET TIMESTAMP=1293832861/*!*/; SET @@session.pseudo_thread_id=999999999/*!*/; -SET @@session.foreign_key_checks=1, @@session.sql_auto_is_null=0, @@session.unique_checks=1, @@session.autocommit=1, @@session.check_constraint_checks=1, @@session.sql_if_exists=0, @@session.explicit_defaults_for_timestamp=0/*!*/; +SET @@session.foreign_key_checks=1, @@session.sql_auto_is_null=0, @@session.unique_checks=1, @@session.autocommit=1, @@session.check_constraint_checks=1, @@session.sql_if_exists=0, @@session.explicit_defaults_for_timestamp=1/*!*/; SET @@session.sql_mode=1411383296/*!*/; SET @@session.auto_increment_increment=1, @@session.auto_increment_offset=1/*!*/; /*!\C latin1 *//*!*/; diff --git a/mysql-test/suite/rpl/r/rpl_mdev382.result b/mysql-test/suite/rpl/r/rpl_mdev382.result index b88b47b2dfa..6a91d9d89de 100644 --- a/mysql-test/suite/rpl/r/rpl_mdev382.result +++ b/mysql-test/suite/rpl/r/rpl_mdev382.result @@ -179,7 +179,7 @@ ROLLBACK/*!*/; use `db1``; select 'oops!'`/*!*/; SET TIMESTAMP=1000000000/*!*/; SET @@session.pseudo_thread_id=999999999/*!*/; -SET @@session.foreign_key_checks=1, @@session.sql_auto_is_null=0, @@session.unique_checks=1, @@session.autocommit=1, @@session.check_constraint_checks=1, @@session.sql_if_exists=0, @@session.explicit_defaults_for_timestamp=0/*!*/; +SET @@session.foreign_key_checks=1, @@session.sql_auto_is_null=0, @@session.unique_checks=1, @@session.autocommit=1, @@session.check_constraint_checks=1, @@session.sql_if_exists=0, @@session.explicit_defaults_for_timestamp=1/*!*/; SET @@session.sql_mode=0/*!*/; SET @@session.auto_increment_increment=1, @@session.auto_increment_offset=1/*!*/; /*!\C latin1 *//*!*/; @@ -279,7 +279,7 @@ ROLLBACK/*!*/; use `db1``; select 'oops!'`/*!*/; SET TIMESTAMP=1000000000/*!*/; SET @@session.pseudo_thread_id=999999999/*!*/; -SET @@session.foreign_key_checks=1, @@session.sql_auto_is_null=0, @@session.unique_checks=1, @@session.autocommit=1, @@session.check_constraint_checks=1, @@session.sql_if_exists=0, @@session.explicit_defaults_for_timestamp=0/*!*/; +SET @@session.foreign_key_checks=1, @@session.sql_auto_is_null=0, @@session.unique_checks=1, @@session.autocommit=1, @@session.check_constraint_checks=1, @@session.sql_if_exists=0, @@session.explicit_defaults_for_timestamp=1/*!*/; SET @@session.sql_mode=0/*!*/; SET @@session.auto_increment_increment=1, @@session.auto_increment_offset=1/*!*/; /*!\C latin1 *//*!*/; @@ -388,7 +388,7 @@ START TRANSACTION use `ts``et`/*!*/; SET TIMESTAMP=1000000000/*!*/; SET @@session.pseudo_thread_id=999999999/*!*/; -SET @@session.foreign_key_checks=1, @@session.sql_auto_is_null=0, @@session.unique_checks=1, @@session.autocommit=1, @@session.check_constraint_checks=1, @@session.sql_if_exists=0, @@session.explicit_defaults_for_timestamp=0/*!*/; +SET @@session.foreign_key_checks=1, @@session.sql_auto_is_null=0, @@session.unique_checks=1, @@session.autocommit=1, @@session.check_constraint_checks=1, @@session.sql_if_exists=0, @@session.explicit_defaults_for_timestamp=1/*!*/; SET @@session.sql_mode=1411383296/*!*/; SET @@session.auto_increment_increment=1, @@session.auto_increment_offset=1/*!*/; /*!\C latin1 *//*!*/; diff --git a/mysql-test/suite/rpl/r/rpl_old_master_29078.result b/mysql-test/suite/rpl/r/rpl_old_master_29078.result index 0b8f8dc7fae..3af1c43cc7c 100644 --- a/mysql-test/suite/rpl/r/rpl_old_master_29078.result +++ b/mysql-test/suite/rpl/r/rpl_old_master_29078.result @@ -47,28 +47,28 @@ ROLLBACK /* added by mysqlbinlog */; /*!50003 SET COMPLETION_TYPE=@OLD_COMPLETION_TYPE*/; /*!50530 SET @@SESSION.PSEUDO_SLAVE_MODE=0*/; connection slave; -set global explicit_defaults_for_timestamp=1; +set global explicit_defaults_for_timestamp=0; include/reset_slave.inc include/start_slave.inc show create table t1; Table Create Table t1 CREATE TABLE `t1` ( - `f1` timestamp NULL DEFAULT NULL, - `f2` timestamp NULL DEFAULT NULL + `f1` timestamp NOT NULL DEFAULT current_timestamp() ON UPDATE current_timestamp(), + `f2` timestamp NOT NULL DEFAULT '0000-00-00 00:00:00' ) ENGINE=MyISAM DEFAULT CHARSET=latin1 show create table t2; Table Create Table t2 CREATE TABLE `t2` ( - `a` timestamp NULL DEFAULT NULL + `a` timestamp NOT NULL DEFAULT current_timestamp() ON UPDATE current_timestamp() ) ENGINE=MyISAM DEFAULT CHARSET=latin1 set time_zone='+2:00'; select * from t1; f1 f2 -NULL NULL -NULL NULL +2022-07-23 16:24:48 2022-07-23 16:24:48 +2022-07-23 16:25:35 0000-00-00 00:00:00 drop table t1; include/stop_slave.inc -set global explicit_defaults_for_timestamp=0; +set global explicit_defaults_for_timestamp=1; include/reset_slave.inc Warnings: Note 4190 RESET SLAVE is implicitly changing the value of 'Using_Gtid' from 'No' to 'Slave_Pos' @@ -76,18 +76,18 @@ include/start_slave.inc show create table t1; Table Create Table t1 CREATE TABLE `t1` ( - `f1` timestamp NOT NULL DEFAULT current_timestamp() ON UPDATE current_timestamp(), - `f2` timestamp NOT NULL DEFAULT '0000-00-00 00:00:00' + `f1` timestamp NULL DEFAULT NULL, + `f2` timestamp NULL DEFAULT NULL ) ENGINE=MyISAM DEFAULT CHARSET=latin1 show create table t2; Table Create Table t2 CREATE TABLE `t2` ( - `a` timestamp NOT NULL DEFAULT current_timestamp() ON UPDATE current_timestamp() + `a` timestamp NULL DEFAULT NULL ) ENGINE=MyISAM DEFAULT CHARSET=latin1 select * from t1; f1 f2 -2022-07-23 16:24:48 2022-07-23 16:24:48 -2022-07-23 16:25:35 0000-00-00 00:00:00 +NULL NULL +NULL NULL drop table t1; connection master; drop table t2; diff --git a/mysql-test/suite/rpl/r/rpl_row_mysqlbinlog.result b/mysql-test/suite/rpl/r/rpl_row_mysqlbinlog.result index 7f6674bca19..67251e2ef72 100644 --- a/mysql-test/suite/rpl/r/rpl_row_mysqlbinlog.result +++ b/mysql-test/suite/rpl/r/rpl_row_mysqlbinlog.result @@ -168,7 +168,7 @@ ROLLBACK/*!*/; use `test`/*!*/; SET TIMESTAMP=1000000000/*!*/; SET @@session.pseudo_thread_id=999999999/*!*/; -SET @@session.foreign_key_checks=1, @@session.sql_auto_is_null=0, @@session.unique_checks=1, @@session.autocommit=1, @@session.check_constraint_checks=1, @@session.sql_if_exists=0, @@session.explicit_defaults_for_timestamp=0/*!*/; +SET @@session.foreign_key_checks=1, @@session.sql_auto_is_null=0, @@session.unique_checks=1, @@session.autocommit=1, @@session.check_constraint_checks=1, @@session.sql_if_exists=0, @@session.explicit_defaults_for_timestamp=1/*!*/; SET @@session.sql_mode=1411383296/*!*/; SET @@session.auto_increment_increment=1, @@session.auto_increment_offset=1/*!*/; /*!\C latin1 *//*!*/; @@ -191,7 +191,7 @@ ROLLBACK/*!*/; use `test`/*!*/; SET TIMESTAMP=1000000000/*!*/; SET @@session.pseudo_thread_id=999999999/*!*/; -SET @@session.foreign_key_checks=1, @@session.sql_auto_is_null=0, @@session.unique_checks=1, @@session.autocommit=1, @@session.check_constraint_checks=1, @@session.sql_if_exists=0, @@session.explicit_defaults_for_timestamp=0/*!*/; +SET @@session.foreign_key_checks=1, @@session.sql_auto_is_null=0, @@session.unique_checks=1, @@session.autocommit=1, @@session.check_constraint_checks=1, @@session.sql_if_exists=0, @@session.explicit_defaults_for_timestamp=1/*!*/; SET @@session.sql_mode=1411383296/*!*/; SET @@session.auto_increment_increment=1, @@session.auto_increment_offset=1/*!*/; /*!\C latin1 *//*!*/; @@ -306,7 +306,7 @@ ROLLBACK/*!*/; use `test`/*!*/; SET TIMESTAMP=1000000000/*!*/; SET @@session.pseudo_thread_id=999999999/*!*/; -SET @@session.foreign_key_checks=1, @@session.sql_auto_is_null=0, @@session.unique_checks=1, @@session.autocommit=1, @@session.check_constraint_checks=1, @@session.sql_if_exists=0, @@session.explicit_defaults_for_timestamp=0/*!*/; +SET @@session.foreign_key_checks=1, @@session.sql_auto_is_null=0, @@session.unique_checks=1, @@session.autocommit=1, @@session.check_constraint_checks=1, @@session.sql_if_exists=0, @@session.explicit_defaults_for_timestamp=1/*!*/; SET @@session.sql_mode=1411383296/*!*/; SET @@session.auto_increment_increment=1, @@session.auto_increment_offset=1/*!*/; /*!\C latin1 *//*!*/; @@ -335,7 +335,7 @@ ROLLBACK/*!*/; use `test`/*!*/; SET TIMESTAMP=1000000000/*!*/; SET @@session.pseudo_thread_id=999999999/*!*/; -SET @@session.foreign_key_checks=1, @@session.sql_auto_is_null=0, @@session.unique_checks=1, @@session.autocommit=1, @@session.check_constraint_checks=1, @@session.sql_if_exists=0, @@session.explicit_defaults_for_timestamp=0/*!*/; +SET @@session.foreign_key_checks=1, @@session.sql_auto_is_null=0, @@session.unique_checks=1, @@session.autocommit=1, @@session.check_constraint_checks=1, @@session.sql_if_exists=0, @@session.explicit_defaults_for_timestamp=1/*!*/; SET @@session.sql_mode=1411383296/*!*/; SET @@session.auto_increment_increment=1, @@session.auto_increment_offset=1/*!*/; /*!\C latin1 *//*!*/; diff --git a/mysql-test/suite/rpl/r/rpl_sp.result b/mysql-test/suite/rpl/r/rpl_sp.result index 3c3fed4d9cf..1e5203e016d 100644 --- a/mysql-test/suite/rpl/r/rpl_sp.result +++ b/mysql-test/suite/rpl/r/rpl_sp.result @@ -784,7 +784,7 @@ DELIMITER /*!*/; ROLLBACK/*!*/; SET TIMESTAMP=t/*!*/; SET @@session.pseudo_thread_id=999999999/*!*/; -SET @@session.foreign_key_checks=1, @@session.sql_auto_is_null=0, @@session.unique_checks=1, @@session.autocommit=1, @@session.check_constraint_checks=1, @@session.sql_if_exists=0, @@session.explicit_defaults_for_timestamp=0/*!*/; +SET @@session.foreign_key_checks=1, @@session.sql_auto_is_null=0, @@session.unique_checks=1, @@session.autocommit=1, @@session.check_constraint_checks=1, @@session.sql_if_exists=0, @@session.explicit_defaults_for_timestamp=1/*!*/; SET @@session.sql_mode=0/*!*/; SET @@session.auto_increment_increment=1, @@session.auto_increment_offset=1/*!*/; /*!\C latin1 *//*!*/; diff --git a/mysql-test/suite/rpl/r/rpl_timestamp.result b/mysql-test/suite/rpl/r/rpl_timestamp.result index 862f19b143c..6983c93af19 100644 --- a/mysql-test/suite/rpl/r/rpl_timestamp.result +++ b/mysql-test/suite/rpl/r/rpl_timestamp.result @@ -7,15 +7,15 @@ create table t1 (f1 timestamp, f2 timestamp); show create table t1; Table Create Table t1 CREATE TABLE `t1` ( - `f1` timestamp NULL DEFAULT NULL, - `f2` timestamp NULL DEFAULT NULL + `f1` timestamp NOT NULL DEFAULT current_timestamp() ON UPDATE current_timestamp(), + `f2` timestamp NOT NULL DEFAULT '0000-00-00 00:00:00' ) ENGINE=MyISAM DEFAULT CHARSET=latin1 connection slave; show create table t1; Table Create Table t1 CREATE TABLE `t1` ( - `f1` timestamp NULL DEFAULT NULL, - `f2` timestamp NULL DEFAULT NULL + `f1` timestamp NOT NULL DEFAULT current_timestamp() ON UPDATE current_timestamp(), + `f2` timestamp NOT NULL DEFAULT '0000-00-00 00:00:00' ) ENGINE=MyISAM DEFAULT CHARSET=latin1 connection master; drop table t1; @@ -28,7 +28,7 @@ ROLLBACK/*!*/; use `test`/*!*/; SET TIMESTAMP=1656940000/*!*/; SET @@session.pseudo_thread_id=999999999/*!*/; -SET @@session.foreign_key_checks=1, @@session.sql_auto_is_null=0, @@session.unique_checks=1, @@session.autocommit=1, @@session.check_constraint_checks=1, @@session.sql_if_exists=0, @@session.explicit_defaults_for_timestamp=1/*!*/; +SET @@session.foreign_key_checks=1, @@session.sql_auto_is_null=0, @@session.unique_checks=1, @@session.autocommit=1, @@session.check_constraint_checks=1, @@session.sql_if_exists=0, @@session.explicit_defaults_for_timestamp=0/*!*/; SET @@session.sql_mode=1411383296/*!*/; SET @@session.auto_increment_increment=1, @@session.auto_increment_offset=1/*!*/; /*!\C latin1 *//*!*/; diff --git a/mysql-test/suite/rpl/t/rpl_old_master_29078.test b/mysql-test/suite/rpl/t/rpl_old_master_29078.test index 0f69ef82ec1..98db6188e96 100644 --- a/mysql-test/suite/rpl/t/rpl_old_master_29078.test +++ b/mysql-test/suite/rpl/t/rpl_old_master_29078.test @@ -23,7 +23,7 @@ create table t2 (a timestamp); --connection slave -set global explicit_defaults_for_timestamp=1; +set global explicit_defaults_for_timestamp=0; --let $master_use_gtid_option= No --source include/reset_slave.inc @@ -36,7 +36,7 @@ select * from t1; drop table t1; --source include/stop_slave.inc -set global explicit_defaults_for_timestamp=0; +set global explicit_defaults_for_timestamp=1; --let $master_use_gtid_option= No --source include/reset_slave.inc diff --git a/mysql-test/suite/vcol/r/vcol_misc.result b/mysql-test/suite/vcol/r/vcol_misc.result index a09939c8cc2..0985b84f3ab 100644 --- a/mysql-test/suite/vcol/r/vcol_misc.result +++ b/mysql-test/suite/vcol/r/vcol_misc.result @@ -403,7 +403,7 @@ Table Create Table t1 CREATE TABLE `t1` ( `a` datetime DEFAULT NULL, `b` timestamp GENERATED ALWAYS AS (cast(`a` as datetime)) VIRTUAL, - `c` timestamp NOT NULL DEFAULT '0000-00-00 00:00:00' + `c` timestamp NULL DEFAULT NULL ) ENGINE=MyISAM DEFAULT CHARSET=latin1 DROP TABLE t1; # diff --git a/mysql-test/suite/vcol/r/vcol_supported_sql_funcs.result b/mysql-test/suite/vcol/r/vcol_supported_sql_funcs.result index 587ac9c150d..34343aea8ec 100644 --- a/mysql-test/suite/vcol/r/vcol_supported_sql_funcs.result +++ b/mysql-test/suite/vcol/r/vcol_supported_sql_funcs.result @@ -2513,8 +2513,8 @@ create table t1 (a timestamp, b timestamp, c long as (timestampdiff(MONTH, a,b)) show create table t1; Table Create Table t1 CREATE TABLE `t1` ( - `a` timestamp NOT NULL DEFAULT current_timestamp() ON UPDATE current_timestamp(), - `b` timestamp NOT NULL DEFAULT '0000-00-00 00:00:00', + `a` timestamp NULL DEFAULT NULL, + `b` timestamp NULL DEFAULT NULL, `c` mediumtext GENERATED ALWAYS AS (timestampdiff(MONTH,`a`,`b`)) VIRTUAL ) ENGINE=MyISAM DEFAULT CHARSET=latin1 insert into t1 values ('2003-02-01','2003-05-01',default); diff --git a/mysql-test/suite/versioning/r/partition,heap.rdiff b/mysql-test/suite/versioning/r/partition,heap.rdiff index 0844017d1f4..41b4c4993d9 100644 --- a/mysql-test/suite/versioning/r/partition,heap.rdiff +++ b/mysql-test/suite/versioning/r/partition,heap.rdiff @@ -1,6 +1,6 @@ --- partition.result +++ partition,heap.reject -@@ -2120,85 +2120,6 @@ +@@ -2132,85 +2132,6 @@ (PARTITION `p0` HISTORY ENGINE = X, PARTITION `pn` CURRENT ENGINE = X) drop tables t1, tp1; @@ -33,7 +33,7 @@ -Table Create Table -tp1 CREATE TABLE `tp1` ( - `x` int(11) NOT NULL AUTO_INCREMENT, -- `t` timestamp(6) NOT NULL DEFAULT '2001-11-11 11:11:11.000000', +- `t` timestamp(6) NULL DEFAULT '2001-11-11 11:11:11.000000', - `b` blob /*!100301 COMPRESSED*/ DEFAULT NULL, - `c` varchar(1033) CHARACTER SET utf8mb3 NOT NULL, - `u` int(11) DEFAULT NULL, @@ -58,7 +58,7 @@ -Table Create Table -t1 CREATE TABLE `t1` ( - `x` int(11) NOT NULL AUTO_INCREMENT, -- `t` timestamp(6) NOT NULL DEFAULT '2001-11-11 11:11:11.000000', +- `t` timestamp(6) NULL DEFAULT '2001-11-11 11:11:11.000000', - `b` blob /*!100301 COMPRESSED*/ DEFAULT NULL, - `c` varchar(1033) CHARACTER SET utf8mb3 NOT NULL, - `u` int(11) DEFAULT NULL, @@ -86,7 +86,7 @@ # # End of 10.7 tests # -@@ -2753,134 +2674,6 @@ +@@ -2765,134 +2686,6 @@ Warning 4114 Versioned table `test`.`t1`: last HISTORY partition (`p0`) is out of INTERVAL, need more HISTORY partitions drop prepare s; affected rows: 0 @@ -119,7 +119,7 @@ -Table Create Table -t1 CREATE TABLE `t1` ( - `x` int(11) NOT NULL AUTO_INCREMENT, -- `t` timestamp(6) NOT NULL DEFAULT '2001-11-11 11:11:11.000000', +- `t` timestamp(6) NULL DEFAULT '2001-11-11 11:11:11.000000', - `b` blob /*!100301 COMPRESSED*/ DEFAULT NULL, - `c` varchar(1033) CHARACTER SET utf8mb3 NOT NULL, - `u` int(11) DEFAULT NULL, @@ -156,7 +156,7 @@ -Table Create Table -t1 CREATE TABLE `t1` ( - `x` int(11) NOT NULL AUTO_INCREMENT, -- `t` timestamp(6) NOT NULL DEFAULT '2001-11-11 11:11:11.000000', +- `t` timestamp(6) NULL DEFAULT '2001-11-11 11:11:11.000000', - `b` blob /*!100301 COMPRESSED*/ DEFAULT NULL, - `c` varchar(1033) CHARACTER SET utf8mb3 NOT NULL, - `u` int(11) DEFAULT NULL, @@ -191,7 +191,7 @@ -Table Create Table -t1 CREATE TABLE `t1` ( - `x` int(11) NOT NULL AUTO_INCREMENT, -- `t` timestamp(6) NOT NULL DEFAULT '2001-11-11 11:11:11.000000', +- `t` timestamp(6) NULL DEFAULT '2001-11-11 11:11:11.000000', - `b` blob /*!100301 COMPRESSED*/ DEFAULT NULL, - `c` varchar(1033) CHARACTER SET utf8mb3 NOT NULL, - `u` int(11) DEFAULT NULL, diff --git a/mysql-test/suite/versioning/r/partition.result b/mysql-test/suite/versioning/r/partition.result index 5ca28a26d35..45ebe46e69d 100644 --- a/mysql-test/suite/versioning/r/partition.result +++ b/mysql-test/suite/versioning/r/partition.result @@ -2161,7 +2161,7 @@ show create table tp1; Table Create Table tp1 CREATE TABLE `tp1` ( `x` int(11) NOT NULL AUTO_INCREMENT, - `t` timestamp(6) NOT NULL DEFAULT '2001-11-11 11:11:11.000000', + `t` timestamp(6) NULL DEFAULT '2001-11-11 11:11:11.000000', `b` blob /*!100301 COMPRESSED*/ DEFAULT NULL, `c` varchar(1033) CHARACTER SET utf8mb3 NOT NULL, `u` int(11) DEFAULT NULL, @@ -2186,7 +2186,7 @@ show create table t1; Table Create Table t1 CREATE TABLE `t1` ( `x` int(11) NOT NULL AUTO_INCREMENT, - `t` timestamp(6) NOT NULL DEFAULT '2001-11-11 11:11:11.000000', + `t` timestamp(6) NULL DEFAULT '2001-11-11 11:11:11.000000', `b` blob /*!100301 COMPRESSED*/ DEFAULT NULL, `c` varchar(1033) CHARACTER SET utf8mb3 NOT NULL, `u` int(11) DEFAULT NULL, @@ -2794,7 +2794,7 @@ show create table t1; Table Create Table t1 CREATE TABLE `t1` ( `x` int(11) NOT NULL AUTO_INCREMENT, - `t` timestamp(6) NOT NULL DEFAULT '2001-11-11 11:11:11.000000', + `t` timestamp(6) NULL DEFAULT '2001-11-11 11:11:11.000000', `b` blob /*!100301 COMPRESSED*/ DEFAULT NULL, `c` varchar(1033) CHARACTER SET utf8mb3 NOT NULL, `u` int(11) DEFAULT NULL, @@ -2831,7 +2831,7 @@ show create table t1; Table Create Table t1 CREATE TABLE `t1` ( `x` int(11) NOT NULL AUTO_INCREMENT, - `t` timestamp(6) NOT NULL DEFAULT '2001-11-11 11:11:11.000000', + `t` timestamp(6) NULL DEFAULT '2001-11-11 11:11:11.000000', `b` blob /*!100301 COMPRESSED*/ DEFAULT NULL, `c` varchar(1033) CHARACTER SET utf8mb3 NOT NULL, `u` int(11) DEFAULT NULL, @@ -2866,7 +2866,7 @@ show create table t1; Table Create Table t1 CREATE TABLE `t1` ( `x` int(11) NOT NULL AUTO_INCREMENT, - `t` timestamp(6) NOT NULL DEFAULT '2001-11-11 11:11:11.000000', + `t` timestamp(6) NULL DEFAULT '2001-11-11 11:11:11.000000', `b` blob /*!100301 COMPRESSED*/ DEFAULT NULL, `c` varchar(1033) CHARACTER SET utf8mb3 NOT NULL, `u` int(11) DEFAULT NULL, diff --git a/mysql-test/suite/versioning/r/simple.result b/mysql-test/suite/versioning/r/simple.result index df47f80c9e9..39ced386a71 100644 --- a/mysql-test/suite/versioning/r/simple.result +++ b/mysql-test/suite/versioning/r/simple.result @@ -81,7 +81,7 @@ period for system_time(d,e) ) with system versioning; show columns from t1; Field Type Null Key Default Extra -a timestamp(6) NO current_timestamp(6) on update current_timestamp(6) +a timestamp(6) YES NULL b timestamp(6) YES NULL VIRTUAL GENERATED c timestamp(6) YES NULL STORED GENERATED d timestamp(6) NO NULL STORED GENERATED @@ -92,8 +92,8 @@ table_schema test table_name t1 column_name a ordinal_position 1 -column_default current_timestamp(6) -is_nullable NO +column_default NULL +is_nullable YES data_type timestamp character_maximum_length NULL character_octet_length NULL @@ -104,7 +104,7 @@ character_set_name NULL collation_name NULL column_type timestamp(6) column_key -extra on update current_timestamp(6) +extra column_comment is_generated NEVER generation_expression NULL diff --git a/plugin/password_reuse_check/password_reuse_check.c b/plugin/password_reuse_check/password_reuse_check.c index 103eb4e4144..e65b724022d 100644 --- a/plugin/password_reuse_check/password_reuse_check.c +++ b/plugin/password_reuse_check/password_reuse_check.c @@ -95,7 +95,7 @@ static int create_table(MYSQL *mysql) // 512/8 = 64 STRING_WITH_LEN("CREATE TABLE mysql." HISTORY_DB_NAME " ( hash binary(64)," - " time timestamp default current_timestamp," + " time timestamp not null default current_timestamp," " primary key (hash), index tm (time) )" " ENGINE=Aria"))) { diff --git a/plugin/type_inet/mysql-test/type_inet/type_inet4.result b/plugin/type_inet/mysql-test/type_inet/type_inet4.result index 11ab87a4949..9029d58a1bd 100644 --- a/plugin/type_inet/mysql-test/type_inet/type_inet4.result +++ b/plugin/type_inet/mysql-test/type_inet/type_inet4.result @@ -1754,7 +1754,7 @@ UPDATE t1 SET b=a; ERROR HY000: Cannot cast 'inet4' as 'timestamp' in assignment of `test`.`t1`.`b` SELECT * FROM t1; a b -0.0.0.0 2001-01-01 10:20:30 +0.0.0.0 NULL DROP TABLE t1; SET timestamp=DEFAULT; CREATE OR REPLACE TABLE t1 (a INET4); diff --git a/plugin/type_inet/mysql-test/type_inet/type_inet4_mix_timestamp.result b/plugin/type_inet/mysql-test/type_inet/type_inet4_mix_timestamp.result index 702e8e19cda..f2481d2c136 100644 --- a/plugin/type_inet/mysql-test/type_inet/type_inet4_mix_timestamp.result +++ b/plugin/type_inet/mysql-test/type_inet/type_inet4_mix_timestamp.result @@ -27,7 +27,7 @@ Table Create Table t2 CREATE TABLE `t2` ( `id` int(11) NOT NULL, `target` inet4 DEFAULT '99.99.99.99', - `source` timestamp NOT NULL DEFAULT '2001-01-01 10:20:30', + `source` timestamp NULL DEFAULT '2001-01-01 10:20:30', PRIMARY KEY (`id`) ) ENGINE=MyISAM DEFAULT CHARSET=latin1 CREATE TABLE t3 LIKE t2; @@ -198,7 +198,7 @@ SHOW CREATE TABLE t2; Table Create Table t2 CREATE TABLE `t2` ( `id` int(11) NOT NULL, - `target` timestamp NOT NULL DEFAULT '2001-01-01 10:20:30', + `target` timestamp NULL DEFAULT '2001-01-01 10:20:30', `source` inet4 DEFAULT '99.99.99.99', PRIMARY KEY (`id`) ) ENGINE=MyISAM DEFAULT CHARSET=latin1 diff --git a/plugin/type_inet/mysql-test/type_inet/type_inet6.result b/plugin/type_inet/mysql-test/type_inet/type_inet6.result index c4506380ffc..6304116ae23 100644 --- a/plugin/type_inet/mysql-test/type_inet/type_inet6.result +++ b/plugin/type_inet/mysql-test/type_inet/type_inet6.result @@ -1928,7 +1928,7 @@ a b :: NULL DROP TABLE t1; SET timestamp=UNIX_TIMESTAMP('2001-01-01 10:20:30'); -CREATE TABLE t1 (a INET6, b TIMESTAMP); +CREATE TABLE t1 (a INET6, b TIMESTAMP NOT NULL DEFAULT NOW() ON UPDATE NOW()); INSERT INTO t1 (a) VALUES ('::'); UPDATE t1 SET b=a; ERROR HY000: Cannot cast 'inet6' as 'timestamp' in assignment of `test`.`t1`.`b` diff --git a/plugin/type_inet/mysql-test/type_inet/type_inet6.test b/plugin/type_inet/mysql-test/type_inet/type_inet6.test index cdfad92f69f..9c618d0c21a 100644 --- a/plugin/type_inet/mysql-test/type_inet/type_inet6.test +++ b/plugin/type_inet/mysql-test/type_inet/type_inet6.test @@ -1411,7 +1411,7 @@ SELECT * FROM t1; DROP TABLE t1; SET timestamp=UNIX_TIMESTAMP('2001-01-01 10:20:30'); -CREATE TABLE t1 (a INET6, b TIMESTAMP); +CREATE TABLE t1 (a INET6, b TIMESTAMP NOT NULL DEFAULT NOW() ON UPDATE NOW()); INSERT INTO t1 (a) VALUES ('::'); --error ER_ILLEGAL_PARAMETER_DATA_TYPES2_FOR_OPERATION UPDATE t1 SET b=a; diff --git a/scripts/mysql_system_tables_fix.sql b/scripts/mysql_system_tables_fix.sql index 8d2c254babd..dbcd6dd9af5 100644 --- a/scripts/mysql_system_tables_fix.sql +++ b/scripts/mysql_system_tables_fix.sql @@ -708,7 +708,7 @@ ALTER TABLE user ADD plugin char(64) CHARACTER SET latin1 DEFAULT '' NOT NULL AF ALTER TABLE user CHANGE auth_string authentication_string TEXT NOT NULL; ALTER TABLE user ADD password_expired ENUM('N', 'Y') COLLATE utf8_general_ci DEFAULT 'N' NOT NULL AFTER authentication_string; -ALTER TABLE user ADD password_last_changed timestamp DEFAULT CURRENT_TIMESTAMP NOT NULL after password_expired; +ALTER TABLE user ADD password_last_changed timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP after password_expired; ALTER TABLE user ADD password_lifetime smallint unsigned DEFAULT NULL after password_last_changed; ALTER TABLE user ADD account_locked enum('N', 'Y') COLLATE utf8_general_ci DEFAULT 'N' NOT NULL after password_lifetime; ALTER TABLE user ADD is_role enum('N', 'Y') COLLATE utf8_general_ci DEFAULT 'N' NOT NULL AFTER account_locked; @@ -730,7 +730,7 @@ ALTER TABLE user MODIFY plugin char(64) CHARACTER SET latin1 DEFAULT '' NOT NULL -- used by MariaDB. MariaDB-10.4 will use these in the creation of mysql.global_priv. -- password_last_changed has a DEFAULT/ON UPDATE of CURRENT_TIMESTAMP to keep track of -- time until 10.4 added. - MODIFY IF EXISTS password_last_changed timestamp DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP AFTER max_statement_time, + MODIFY IF EXISTS password_last_changed timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP AFTER max_statement_time, MODIFY IF EXISTS password_lifetime smallint unsigned DEFAULT NULL AFTER password_last_changed, MODIFY IF EXISTS account_locked enum('N', 'Y') CHARACTER SET utf8 DEFAULT 'N' NOT NULL after password_lifetime; diff --git a/scripts/sys_schema/tables/sys_config.sql b/scripts/sys_schema/tables/sys_config.sql index f887d050875..37d0a183edc 100644 --- a/scripts/sys_schema/tables/sys_config.sql +++ b/scripts/sys_schema/tables/sys_config.sql @@ -22,7 +22,7 @@ CREATE TABLE IF NOT EXISTS sys_config ( variable VARCHAR(128) PRIMARY KEY, value VARCHAR(128), - set_time TIMESTAMP DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP, + set_time TIMESTAMP NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP, set_by VARCHAR(128) ) ENGINE = Aria; diff --git a/sql/sys_vars.cc b/sql/sys_vars.cc index 92b73b64359..b589ad15d65 100644 --- a/sql/sys_vars.cc +++ b/sql/sys_vars.cc @@ -725,7 +725,7 @@ static Sys_var_bit Sys_explicit_defaults_for_timestamp( "as NULL with DEFAULT NULL attribute, Without this option, " "TIMESTAMP columns are NOT NULL and have implicit DEFAULT clauses.", SESSION_VAR(option_bits), CMD_LINE(OPT_ARG), - OPTION_EXPLICIT_DEF_TIMESTAMP, DEFAULT(FALSE), NO_MUTEX_GUARD, IN_BINLOG); + OPTION_EXPLICIT_DEF_TIMESTAMP, DEFAULT(TRUE), NO_MUTEX_GUARD, IN_BINLOG); static Sys_var_ulonglong Sys_bulk_insert_buff_size( "bulk_insert_buffer_size", "Size of tree cache used in bulk " diff --git a/storage/mroonga/mysql-test/mroonga/storage/r/create_table_TODO_SPLIT_ME.result b/storage/mroonga/mysql-test/mroonga/storage/r/create_table_TODO_SPLIT_ME.result index d2a00b777ec..a09c2fe2beb 100644 --- a/storage/mroonga/mysql-test/mroonga/storage/r/create_table_TODO_SPLIT_ME.result +++ b/storage/mroonga/mysql-test/mroonga/storage/r/create_table_TODO_SPLIT_ME.result @@ -64,7 +64,7 @@ drop table t1; create table t1 (c1 timestamp); desc t1; Field Type Null Key Default Extra -c1 timestamp NO CURRENT_TIMESTAMP on update CURRENT_TIMESTAMP +c1 timestamp YES NULL drop table t1; create table t1 (c1 datetime); desc t1; diff --git a/storage/mroonga/mysql-test/mroonga/wrapper/r/create_table_TODO_SPLIT_ME.result b/storage/mroonga/mysql-test/mroonga/wrapper/r/create_table_TODO_SPLIT_ME.result index b3814331038..16a7e9e67f3 100644 --- a/storage/mroonga/mysql-test/mroonga/wrapper/r/create_table_TODO_SPLIT_ME.result +++ b/storage/mroonga/mysql-test/mroonga/wrapper/r/create_table_TODO_SPLIT_ME.result @@ -63,7 +63,7 @@ drop table t1; create table t1 (c1 timestamp primary key) COMMENT = 'engine "innodb"'; desc t1; Field Type Null Key Default Extra -c1 timestamp NO PRI CURRENT_TIMESTAMP on update CURRENT_TIMESTAMP +c1 timestamp NO PRI NULL drop table t1; create table t1 (c1 datetime primary key) COMMENT = 'engine "innodb"'; desc t1; diff --git a/storage/mroonga/mysql-test/mroonga/wrapper/r/insert_on_duplicate_key_update_multiple_column_primary_key_myisam.result b/storage/mroonga/mysql-test/mroonga/wrapper/r/insert_on_duplicate_key_update_multiple_column_primary_key_myisam.result index d34a3827230..b03ea64036f 100644 --- a/storage/mroonga/mysql-test/mroonga/wrapper/r/insert_on_duplicate_key_update_multiple_column_primary_key_myisam.result +++ b/storage/mroonga/mysql-test/mroonga/wrapper/r/insert_on_duplicate_key_update_multiple_column_primary_key_myisam.result @@ -8,7 +8,7 @@ PRIMARY KEY (date, title) SHOW CREATE TABLE diaries; Table Create Table diaries CREATE TABLE `diaries` ( - `date` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP, + `date` timestamp NOT NULL, `title` varchar(100) NOT NULL, `content` text NOT NULL, PRIMARY KEY (`date`,`title`) diff --git a/storage/mroonga/mysql-test/mroonga/wrapper/r/insert_on_duplicate_key_update_multiple_column_unique_index_myisam.result b/storage/mroonga/mysql-test/mroonga/wrapper/r/insert_on_duplicate_key_update_multiple_column_unique_index_myisam.result index ab1cc56cdc5..fc1e2bc38e8 100644 --- a/storage/mroonga/mysql-test/mroonga/wrapper/r/insert_on_duplicate_key_update_multiple_column_unique_index_myisam.result +++ b/storage/mroonga/mysql-test/mroonga/wrapper/r/insert_on_duplicate_key_update_multiple_column_unique_index_myisam.result @@ -10,7 +10,7 @@ SHOW CREATE TABLE diaries; Table Create Table diaries CREATE TABLE `diaries` ( `id` int(11) NOT NULL AUTO_INCREMENT, - `date` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP, + `date` timestamp NOT NULL, `title` varchar(100) NOT NULL, `content` text NOT NULL, PRIMARY KEY (`id`), |