diff options
Diffstat (limited to 'mysql-test/main/type_timestamp.result')
| -rw-r--r-- | mysql-test/main/type_timestamp.result | 32 |
1 files changed, 16 insertions, 16 deletions
diff --git a/mysql-test/main/type_timestamp.result b/mysql-test/main/type_timestamp.result index a5754e4cfc5..508dd56f694 100644 --- a/mysql-test/main/type_timestamp.result +++ b/mysql-test/main/type_timestamp.result @@ -174,7 +174,7 @@ t1 CREATE TABLE `t1` ( `t1` timestamp NOT NULL DEFAULT '2003-01-01 00:00:00', `t2` datetime DEFAULT NULL, `t3` timestamp NOT NULL DEFAULT '0000-00-00 00:00:00' -) ENGINE=MyISAM DEFAULT CHARSET=latin1 +) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci show columns from t1; Field Type Null Key Default Extra t1 timestamp NO 2003-01-01 00:00:00 @@ -198,7 +198,7 @@ t1 CREATE TABLE `t1` ( `t1` timestamp NOT NULL DEFAULT current_timestamp(), `t2` datetime DEFAULT NULL, `t3` timestamp NOT NULL DEFAULT '0000-00-00 00:00:00' -) ENGINE=MyISAM DEFAULT CHARSET=latin1 +) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci show columns from t1; Field Type Null Key Default Extra t1 timestamp NO current_timestamp() @@ -224,7 +224,7 @@ Table Create Table t1 CREATE TABLE `t1` ( `t1` timestamp NOT NULL DEFAULT '2003-01-01 00:00:00' ON UPDATE current_timestamp(), `t2` datetime DEFAULT NULL -) ENGINE=MyISAM DEFAULT CHARSET=latin1 +) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci show columns from t1; Field Type Null Key Default Extra t1 timestamp NO 2003-01-01 00:00:00 on update current_timestamp() @@ -249,7 +249,7 @@ Table Create Table t1 CREATE TABLE `t1` ( `t1` timestamp NOT NULL DEFAULT current_timestamp() ON UPDATE current_timestamp(), `t2` datetime DEFAULT NULL -) ENGINE=MyISAM DEFAULT CHARSET=latin1 +) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci show columns from t1; Field Type Null Key Default Extra t1 timestamp NO current_timestamp() on update current_timestamp() @@ -275,7 +275,7 @@ t1 CREATE TABLE `t1` ( `t1` timestamp NOT NULL DEFAULT current_timestamp() ON UPDATE current_timestamp(), `t2` datetime DEFAULT NULL, `t3` timestamp NOT NULL DEFAULT '0000-00-00 00:00:00' -) ENGINE=MyISAM DEFAULT CHARSET=latin1 +) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci show columns from t1; Field Type Null Key Default Extra t1 timestamp NO current_timestamp() on update current_timestamp() @@ -301,7 +301,7 @@ Table Create Table t1 CREATE TABLE `t1` ( `t1` timestamp NOT NULL DEFAULT current_timestamp() ON UPDATE current_timestamp(), `t2` datetime DEFAULT NULL -) ENGINE=MyISAM DEFAULT CHARSET=latin1 +) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci show columns from t1; Field Type Null Key Default Extra t1 timestamp NO current_timestamp() on update current_timestamp() @@ -356,7 +356,7 @@ Table Create Table t1 CREATE TABLE `t1` ( `a` timestamp NULL DEFAULT NULL, `b` timestamp NULL DEFAULT NULL -) ENGINE=MyISAM DEFAULT CHARSET=latin1 +) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci insert into t1 values (NULL, NULL); SET TIMESTAMP=1000000017; insert into t1 values (); @@ -371,7 +371,7 @@ Table Create Table t1 CREATE TABLE `t1` ( `a` timestamp NULL DEFAULT current_timestamp() ON UPDATE current_timestamp(), `b` timestamp NULL DEFAULT NULL -) ENGINE=MyISAM DEFAULT CHARSET=latin1 +) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci insert into t1 values (NULL, NULL); SET TIMESTAMP=1000000018; insert into t1 values (); @@ -386,7 +386,7 @@ Table Create Table t1 CREATE TABLE `t1` ( `a` timestamp NULL DEFAULT NULL, `b` timestamp NULL DEFAULT '2003-01-01 00:00:00' -) ENGINE=MyISAM DEFAULT CHARSET=latin1 +) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci insert into t1 values (NULL, NULL); insert into t1 values (DEFAULT, DEFAULT); select * from t1; @@ -727,12 +727,12 @@ SHOW CREATE TABLE t1; Table Create Table t1 CREATE TABLE `t1` ( `ts` timestamp NOT NULL DEFAULT current_timestamp() -) ENGINE=MyISAM DEFAULT CHARSET=latin1 +) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci SHOW CREATE TABLE t2; Table Create Table t2 CREATE TABLE `t2` ( `ts` timestamp NOT NULL DEFAULT current_timestamp() -) ENGINE=MyISAM DEFAULT CHARSET=latin1 +) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci DROP TABLE t1,t2; SET sql_mode=DEFAULT; # @@ -748,13 +748,13 @@ Table Create Table t1 CREATE TABLE `t1` ( `vc` varchar(10) NOT NULL DEFAULT 'test', `ts` timestamp NULL DEFAULT NULL ON UPDATE current_timestamp() -) ENGINE=MyISAM DEFAULT CHARSET=latin1 +) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci SHOW CREATE TABLE t2; Table Create Table t2 CREATE TABLE `t2` ( `vc` varchar(10) NOT NULL DEFAULT 'test', `ts` timestamp NULL DEFAULT NULL ON UPDATE current_timestamp() -) ENGINE=MyISAM DEFAULT CHARSET=latin1 +) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci DROP TABLE t1,t2; End of 10.0 tests # @@ -1025,7 +1025,7 @@ t2 CREATE TABLE `t2` ( `COALESCE(a)` timestamp NULL DEFAULT NULL, `COALESCE(MAX(a))` timestamp NULL DEFAULT NULL, `MAX(COALESCE(a))` timestamp NULL DEFAULT NULL -) ENGINE=MyISAM DEFAULT CHARSET=latin1 +) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci DROP TABLE t2; DROP TABLE t1; # @@ -1332,7 +1332,7 @@ 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' -) ENGINE=MyISAM DEFAULT CHARSET=latin1 +) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci drop table t1; set explicit_defaults_for_timestamp=ON; create table t1 (f1 timestamp, f2 timestamp); @@ -1341,7 +1341,7 @@ Table Create Table t1 CREATE TABLE `t1` ( `f1` timestamp NULL DEFAULT NULL, `f2` timestamp NULL DEFAULT NULL -) ENGINE=MyISAM DEFAULT CHARSET=latin1 +) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci drop table t1; # # End of 10.10 tests |