diff options
| author | Sergei Golubchik <serg@mariadb.org> | 2016-11-07 17:17:40 +0100 |
|---|---|---|
| committer | Sergei Golubchik <serg@mariadb.org> | 2016-12-12 20:35:41 +0100 |
| commit | a411d7f4f670c24b43b50f7d2a1129e10218f4a7 (patch) | |
| tree | cc1e9cdf6b85bdcec8c0369e502d4d211b2f7263 /mysql-test/r/sql_mode.result | |
| parent | 8b3b6dc377c548b1b72978a015af999cf6e99760 (diff) | |
| download | mariadb-git-a411d7f4f670c24b43b50f7d2a1129e10218f4a7.tar.gz | |
store/show vcols as item->print()
otherwise we'd need to store sql_mode *per vcol*
(consider CREATE INDEX...) and how SHOW CREATE TABLE would
support that?
Additionally, get rid of vcol::expr_str, just to make sure
the string is always generated and never leaked in the
original form.
Diffstat (limited to 'mysql-test/r/sql_mode.result')
| -rw-r--r-- | mysql-test/r/sql_mode.result | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/mysql-test/r/sql_mode.result b/mysql-test/r/sql_mode.result index e1afb964f0a..782ae00bb33 100644 --- a/mysql-test/r/sql_mode.result +++ b/mysql-test/r/sql_mode.result @@ -149,7 +149,7 @@ show create table t1; Table Create Table t1 CREATE TABLE "t1" ( "f1" int(11) NOT NULL AUTO_INCREMENT, - "f2" timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP, + "f2" timestamp NOT NULL DEFAULT current_timestamp() ON UPDATE current_timestamp(), PRIMARY KEY ("f1") ) set session sql_mode=no_field_options; @@ -157,7 +157,7 @@ show create table t1; Table Create Table t1 CREATE TABLE `t1` ( `f1` int(11) NOT NULL, - `f2` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP, + `f2` timestamp NOT NULL DEFAULT current_timestamp(), PRIMARY KEY (`f1`) ) ENGINE=MyISAM DEFAULT CHARSET=latin1 drop table t1; |