summaryrefslogtreecommitdiff
path: root/mysql-test/suite/vcol/r
diff options
context:
space:
mode:
authorIgor Babaev <igor@askmonty.org>2013-01-23 15:18:05 -0800
committerIgor Babaev <igor@askmonty.org>2013-01-23 15:18:05 -0800
commit32151409c13ddc09ebda7cd02fdfe40db290503e (patch)
tree86997a41bbc6c4379209af0cccdb4ae612c8d4f4 /mysql-test/suite/vcol/r
parentf1e758dc6f4183a8e3856d21c95f7e4973c585c1 (diff)
parent746152959a8787f3c7cf6b1c710fc1ee6c54419f (diff)
downloadmariadb-git-32151409c13ddc09ebda7cd02fdfe40db290503e.tar.gz
Merge 5.3->5.5
Diffstat (limited to 'mysql-test/suite/vcol/r')
-rw-r--r--mysql-test/suite/vcol/r/vcol_misc.result11
1 files changed, 11 insertions, 0 deletions
diff --git a/mysql-test/suite/vcol/r/vcol_misc.result b/mysql-test/suite/vcol/r/vcol_misc.result
index 17b38b7d7af..14467b2d630 100644
--- a/mysql-test/suite/vcol/r/vcol_misc.result
+++ b/mysql-test/suite/vcol/r/vcol_misc.result
@@ -182,6 +182,17 @@ a b c
2 3 y
0 1 y,n
drop table t1,t2;
+CREATE TABLE t1 (
+ts TIMESTAMP,
+tsv TIMESTAMP AS (ADDDATE(ts, INTERVAL 1 DAY)) VIRTUAL
+) ENGINE=MyISAM;
+INSERT INTO t1 (tsv) VALUES (DEFAULT);
+INSERT DELAYED INTO t1 (tsv) VALUES (DEFAULT);
+FLUSH TABLES;
+SELECT COUNT(*) FROM t1;
+COUNT(*)
+2
+DROP TABLE t1;
create table t1 (a int, b int);
insert into t1 values (3, 30), (4, 20), (1, 20);
create table t2 (c int, d int, v int as (d+1), index idx(c));