diff options
author | Vicențiu Ciorbaru <vicentiu@mariadb.org> | 2017-01-14 19:56:00 +0200 |
---|---|---|
committer | Vicențiu Ciorbaru <vicentiu@mariadb.org> | 2017-01-14 19:59:34 +0200 |
commit | 66744f4540c464413055a79111c34449e8381618 (patch) | |
tree | 0905a1b2e47efb1dcd3dde1c9d5187fa45e780dc /mysql-test/suite/vcol/t | |
parent | 939d1255a78e374f468154f3353e5faa0fa517ca (diff) | |
parent | 20ca1bcf4bd81ed43683676276b5f27dc8da8e91 (diff) | |
download | mariadb-git-66744f4540c464413055a79111c34449e8381618.tar.gz |
Merge branch '5.5' into 10.0
Diffstat (limited to 'mysql-test/suite/vcol/t')
-rw-r--r-- | mysql-test/suite/vcol/t/vcol_misc.test | 11 |
1 files changed, 11 insertions, 0 deletions
diff --git a/mysql-test/suite/vcol/t/vcol_misc.test b/mysql-test/suite/vcol/t/vcol_misc.test index 12f46e9b002..80a36d9c623 100644 --- a/mysql-test/suite/vcol/t/vcol_misc.test +++ b/mysql-test/suite/vcol/t/vcol_misc.test @@ -290,3 +290,14 @@ create table t1 (a int, b int as (b is null) virtual); create table t1 (v1 varchar(255) as (c1) persistent, c1 varchar(50)) collate=latin1_general_ci; show create table t1; drop table t1; + +# +# MDEV-11527 Virtual columns do not get along well with NO_ZERO_DATE +# +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; |