Follow-up for a411d7f4 - change in formatting of SHOW CREATE TABLE

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 DEFAULT current_timestamp() ON UPDATE current_timestamp(),
   KEY `i1` (`c1`)
 ) ENGINE=ENGINE DEFAULT CHARSET=latin1
 DROP TABLE t1;

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 DEFAULT current_timestamp() ON UPDATE current_timestamp(),
   UNIQUE KEY `i1` (`c1`)
 ) ENGINE=ENGINE DEFAULT CHARSET=latin1
 DROP TABLE t1;

mysql-test/suite/engines/funcs/r/ta_2part_column_to_pk.result

@@ -342,7 +342,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 DEFAULT current_timestamp() ON UPDATE current_timestamp(),
   `c2` timestamp NOT NULL DEFAULT '0000-00-00 00:00:00'
 ) ENGINE=ENGINE DEFAULT CHARSET=latin1
 ALTER TABLE t1 ADD PRIMARY KEY (c1,c2);
@@ -352,7 +352,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 DEFAULT current_timestamp() ON UPDATE current_timestamp(),
   `c2` timestamp NOT NULL DEFAULT '0000-00-00 00:00:00',
   PRIMARY KEY (`c1`,`c2`)
 ) ENGINE=ENGINE DEFAULT CHARSET=latin1

mysql-test/suite/engines/funcs/r/ta_3part_column_to_pk.result

@@ -370,7 +370,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 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'
 ) ENGINE=ENGINE DEFAULT CHARSET=latin1
@@ -381,7 +381,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 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',
   PRIMARY KEY (`c1`,`c2`,`c3`)

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 DEFAULT current_timestamp() ON UPDATE current_timestamp()
 ) 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 DEFAULT current_timestamp() ON UPDATE current_timestamp()
 ) 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 DEFAULT current_timestamp() ON UPDATE current_timestamp()
 ) 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 DEFAULT current_timestamp() ON UPDATE current_timestamp()
 ) ENGINE=ENGINE DEFAULT CHARSET=latin1
 DROP TABLE t1;
 SHOW TABLES;

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 DEFAULT current_timestamp() ON UPDATE current_timestamp(),
   `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 DEFAULT current_timestamp() ON UPDATE current_timestamp(),
   `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 DEFAULT current_timestamp() ON UPDATE current_timestamp(),
   `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 DEFAULT current_timestamp() ON UPDATE current_timestamp(),
   `c1` varbinary(15) NOT NULL
 ) ENGINE=ENGINE DEFAULT CHARSET=latin1
 DROP TABLE t1;

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 DEFAULT current_timestamp() ON UPDATE current_timestamp(),
   `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 DEFAULT current_timestamp() ON UPDATE current_timestamp(),
   `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 DEFAULT current_timestamp() ON UPDATE current_timestamp(),
   `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 DEFAULT current_timestamp() ON UPDATE current_timestamp(),
   `c3` varbinary(20) NOT NULL,
   PRIMARY KEY (`c1`)
 ) ENGINE=ENGINE DEFAULT CHARSET=latin1

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 DEFAULT current_timestamp() ON UPDATE current_timestamp()
 ) 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 DEFAULT current_timestamp() ON UPDATE current_timestamp(),
   `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 DEFAULT current_timestamp() ON UPDATE current_timestamp()
 ) 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 DEFAULT current_timestamp() ON UPDATE current_timestamp(),
   `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 DEFAULT current_timestamp() ON UPDATE current_timestamp()
 ) 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 DEFAULT current_timestamp() ON UPDATE current_timestamp(),
   `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 DEFAULT current_timestamp() ON UPDATE current_timestamp()
 ) 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 DEFAULT current_timestamp() ON UPDATE current_timestamp(),
   `c2` varbinary(5) NOT NULL
 ) ENGINE=ENGINE DEFAULT CHARSET=latin1
 DROP TABLE t5;

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 DEFAULT current_timestamp() ON UPDATE current_timestamp()
 ) 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 DEFAULT current_timestamp() ON UPDATE current_timestamp()
 ) 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 DEFAULT current_timestamp() ON UPDATE current_timestamp()
 ) 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 DEFAULT current_timestamp() ON UPDATE current_timestamp()
 ) 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 DEFAULT current_timestamp() ON UPDATE current_timestamp()
 ) 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 DEFAULT current_timestamp() ON UPDATE current_timestamp()
 ) 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 DEFAULT current_timestamp() ON UPDATE current_timestamp()
 ) 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 DEFAULT current_timestamp() ON UPDATE current_timestamp()
 ) ENGINE=ENGINE DEFAULT CHARSET=latin1
 DROP TABLE t5;
 SHOW TABLES;

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 DEFAULT current_timestamp() ON UPDATE current_timestamp(),
   `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 DEFAULT current_timestamp() ON UPDATE current_timestamp(),
   `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 DEFAULT current_timestamp() ON UPDATE current_timestamp(),
   `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 DEFAULT current_timestamp() ON UPDATE current_timestamp(),
   `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 DEFAULT current_timestamp() ON UPDATE current_timestamp(),
   `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 DEFAULT current_timestamp() ON UPDATE current_timestamp(),
   `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 DEFAULT current_timestamp() ON UPDATE current_timestamp(),
   `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 DEFAULT current_timestamp() ON UPDATE current_timestamp(),
   `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 DEFAULT current_timestamp() ON UPDATE current_timestamp(),
   `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 DEFAULT current_timestamp() ON UPDATE current_timestamp(),
   `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 DEFAULT current_timestamp() ON UPDATE current_timestamp(),
   `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 DEFAULT current_timestamp() ON UPDATE current_timestamp(),
   `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 DEFAULT current_timestamp() ON UPDATE current_timestamp(),
   `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 DEFAULT current_timestamp() ON UPDATE current_timestamp(),
   `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 DEFAULT current_timestamp() ON UPDATE current_timestamp(),
   `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 DEFAULT current_timestamp() ON UPDATE current_timestamp(),
   `c2` int(11) NOT NULL,
   `c4` varbinary(5) NOT NULL,
   `c3` varbinary(10) NOT NULL,

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 DEFAULT current_timestamp() ON UPDATE current_timestamp()
 ) 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 DEFAULT current_timestamp() ON UPDATE current_timestamp(),
   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 DEFAULT current_timestamp() ON UPDATE current_timestamp()
 ) 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 DEFAULT current_timestamp() ON UPDATE current_timestamp(),
   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 DEFAULT current_timestamp() ON UPDATE current_timestamp()
 ) 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 DEFAULT current_timestamp() ON UPDATE current_timestamp(),
   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 DEFAULT current_timestamp() ON UPDATE current_timestamp()
 ) 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 DEFAULT current_timestamp() ON UPDATE current_timestamp(),
   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 DEFAULT current_timestamp() ON UPDATE current_timestamp()
 ) 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 DEFAULT current_timestamp() ON UPDATE current_timestamp(),
   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 DEFAULT current_timestamp() ON UPDATE current_timestamp()
 ) 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 DEFAULT current_timestamp() ON UPDATE current_timestamp(),
   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 DEFAULT current_timestamp() ON UPDATE current_timestamp()
 ) 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 DEFAULT current_timestamp() ON UPDATE current_timestamp(),
   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 DEFAULT current_timestamp() ON UPDATE current_timestamp()
 ) 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 DEFAULT current_timestamp() ON UPDATE current_timestamp(),
   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 DEFAULT current_timestamp() ON UPDATE current_timestamp()
 ) 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 DEFAULT current_timestamp() ON UPDATE current_timestamp(),
   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 DEFAULT current_timestamp() ON UPDATE current_timestamp()
 ) 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 DEFAULT current_timestamp() ON UPDATE current_timestamp(),
   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 DEFAULT current_timestamp() ON UPDATE current_timestamp()
 ) 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 DEFAULT current_timestamp() ON UPDATE current_timestamp(),
   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 DEFAULT current_timestamp() ON UPDATE current_timestamp()
 ) 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 DEFAULT current_timestamp() ON UPDATE current_timestamp(),
   KEY `i1` (`c1`) USING HASH
 ) ENGINE=ENGINE DEFAULT CHARSET=latin1
 DROP TABLE t1;

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 DEFAULT current_timestamp() ON UPDATE current_timestamp()
 ) 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 DEFAULT current_timestamp() ON UPDATE current_timestamp()
 ) ENGINE=ENGINE DEFAULT CHARSET=latin1
 DROP TABLE t1;
 SHOW TABLES;

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 DEFAULT current_timestamp() ON UPDATE current_timestamp()
 ) 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 DEFAULT current_timestamp() ON UPDATE current_timestamp()
 ) ENGINE=ENGINE DEFAULT CHARSET=latin1
 ALTER TABLE t2 CHANGE c1 c1 TIMESTAMP NULL;
 SHOW TABLES;

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 DEFAULT current_timestamp() ON UPDATE current_timestamp()
 ) 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 DEFAULT current_timestamp() ON UPDATE current_timestamp(),
   PRIMARY KEY (`c1`)
 ) ENGINE=ENGINE DEFAULT CHARSET=latin1
 DROP TABLE t1;

mysql-test/suite/engines/funcs/r/ta_drop_column.result

@@ -300,7 +300,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 DEFAULT current_timestamp() ON UPDATE current_timestamp(),
   `c2` timestamp NOT NULL DEFAULT '0000-00-00 00:00:00'
 ) ENGINE=ENGINE DEFAULT CHARSET=latin1
 ALTER TABLE t1 DROP   c2;
@@ -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 DEFAULT current_timestamp() ON UPDATE current_timestamp()
 ) ENGINE=ENGINE DEFAULT CHARSET=latin1
 DROP TABLE t1;
 SHOW TABLES;
@@ -636,7 +636,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 DEFAULT current_timestamp() ON UPDATE current_timestamp(),
   `c2` timestamp NOT NULL DEFAULT '0000-00-00 00:00:00'
 ) ENGINE=ENGINE DEFAULT CHARSET=latin1
 ALTER TABLE t1 DROP COLUMN c2;
@@ -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 DEFAULT current_timestamp() ON UPDATE current_timestamp()
 ) ENGINE=ENGINE DEFAULT CHARSET=latin1
 DROP TABLE t1;
 SHOW TABLES;

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 DEFAULT current_timestamp() ON UPDATE current_timestamp(),
   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 DEFAULT current_timestamp() ON UPDATE current_timestamp()
 ) 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 DEFAULT current_timestamp() ON UPDATE current_timestamp(),
   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 DEFAULT current_timestamp() ON UPDATE current_timestamp()
 ) 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 DEFAULT current_timestamp() ON UPDATE current_timestamp(),
   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 DEFAULT current_timestamp() ON UPDATE current_timestamp()
 ) 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 DEFAULT current_timestamp() ON UPDATE current_timestamp(),
   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 DEFAULT current_timestamp() ON UPDATE current_timestamp()
 ) 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 DEFAULT current_timestamp() ON UPDATE current_timestamp(),
   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 DEFAULT current_timestamp() ON UPDATE current_timestamp()
 ) 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 DEFAULT current_timestamp() ON UPDATE current_timestamp(),
   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 DEFAULT current_timestamp() ON UPDATE current_timestamp()
 ) ENGINE=ENGINE DEFAULT CHARSET=latin1
 DROP TABLE t1;
 SHOW TABLES;

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 DEFAULT current_timestamp() ON UPDATE current_timestamp(),
   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 DEFAULT current_timestamp() ON UPDATE current_timestamp()
 ) ENGINE=ENGINE DEFAULT CHARSET=latin1
 DROP TABLE t9;
 SHOW TABLES;

mysql-test/suite/engines/funcs/r/ta_rename.result

@@ -356,7 +356,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 DEFAULT current_timestamp() ON UPDATE current_timestamp(),
   `c2` timestamp NOT NULL DEFAULT '0000-00-00 00:00:00'
 ) ENGINE=ENGINE DEFAULT CHARSET=latin1
 ALTER TABLE t1 RENAME t2;
@@ -368,7 +368,7 @@ 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,
+  `c1` timestamp NOT NULL DEFAULT current_timestamp() ON UPDATE current_timestamp(),
   `c2` timestamp NOT NULL DEFAULT '0000-00-00 00:00:00'
 ) ENGINE=ENGINE DEFAULT CHARSET=latin1
 DROP TABLE t2;
@@ -756,7 +756,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 DEFAULT current_timestamp() ON UPDATE current_timestamp(),
   `c2` timestamp NOT NULL DEFAULT '0000-00-00 00:00:00'
 ) ENGINE=ENGINE DEFAULT CHARSET=latin1
 ALTER TABLE t1 RENAME TO t2;
@@ -768,7 +768,7 @@ 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,
+  `c1` timestamp NOT NULL DEFAULT current_timestamp() ON UPDATE current_timestamp(),
   `c2` timestamp NOT NULL DEFAULT '0000-00-00 00:00:00'
 ) ENGINE=ENGINE DEFAULT CHARSET=latin1
 DROP TABLE t2;

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 DEFAULT current_timestamp() ON UPDATE current_timestamp(),
   PRIMARY KEY (`c1`)
 ) ENGINE=ENGINE DEFAULT CHARSET=latin1
 DROP TABLE t9;

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 DEFAULT current_timestamp() ON UPDATE current_timestamp()
 ) ENGINE=ENGINE DEFAULT CHARSET=latin1
 DROP TABLE t2;
 SHOW TABLES;

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 DEFAULT current_timestamp() ON UPDATE current_timestamp(),
   PRIMARY KEY (`c1`)
 ) ENGINE=ENGINE DEFAULT CHARSET=latin1
 DROP TABLE t9;

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 DEFAULT current_timestamp() ON UPDATE current_timestamp(),
   UNIQUE KEY `c1` (`c1`)
 ) ENGINE=ENGINE DEFAULT CHARSET=latin1
 DROP TABLE t9;

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 DEFAULT current_timestamp() ON UPDATE current_timestamp()
 ) ENGINE=ENGINE DEFAULT CHARSET=latin1
 DROP TABLE t1;
 SHOW TABLES;