diff options
| author | Sergei Golubchik <serg@mariadb.org> | 2017-02-11 09:45:34 +0100 |
|---|---|---|
| committer | Sergei Golubchik <serg@mariadb.org> | 2017-02-11 09:45:34 +0100 |
| commit | f3914d10b61eb4bc4184b2a9aa92a998e1abd779 (patch) | |
| tree | 0f973c0dc2fb1f667ed852e4177b17938e28b6b9 /mysql-test/suite/vcol/r/vcol_misc.result | |
| parent | 559345806216369bad999539018bd3943860a5d5 (diff) | |
| parent | 2195bb4e416232ab807ff67eecf03b1223bf6bff (diff) | |
| download | mariadb-git-f3914d10b61eb4bc4184b2a9aa92a998e1abd779.tar.gz | |
Merge branch 'bb-10.2-serg-merge' into 10.2
Diffstat (limited to 'mysql-test/suite/vcol/r/vcol_misc.result')
| -rw-r--r-- | mysql-test/suite/vcol/r/vcol_misc.result | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/mysql-test/suite/vcol/r/vcol_misc.result b/mysql-test/suite/vcol/r/vcol_misc.result index ed78731c605..9aadc5ed4bb 100644 --- a/mysql-test/suite/vcol/r/vcol_misc.result +++ b/mysql-test/suite/vcol/r/vcol_misc.result @@ -328,6 +328,13 @@ t1 CREATE TABLE `t1` ( `c1` varchar(50) COLLATE latin1_general_ci DEFAULT NULL ) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci drop table t1; +set sql_mode='no_zero_date'; +create table t1 ( +ts timestamp not null default current_timestamp, +tsv timestamp as (adddate(ts, interval 1 day)) virtual +); +drop table t1; +set sql_mode=default; # # Start of 10.1 tests # |