summaryrefslogtreecommitdiff
path: root/mysql-test
diff options
context:
space:
mode:
authorMarko Mäkelä <marko.makela@mariadb.com>2019-04-03 09:20:44 +0300
committerMarko Mäkelä <marko.makela@mariadb.com>2019-04-03 09:20:44 +0300
commit268d46b87d56c4615591d59dd2c67c4233679e5d (patch)
tree3fec7b3b79f9e21f15142a1999a2dae6f10ef59d /mysql-test
parentb896f60a73aea32843a0a86a35def669d82503af (diff)
parent977d7a7572ce97b1f21bfef8531a5c574f518ba2 (diff)
downloadmariadb-git-268d46b87d56c4615591d59dd2c67c4233679e5d.tar.gz
Merge 10.3 into 10.4
Diffstat (limited to 'mysql-test')
-rw-r--r--mysql-test/suite/gcol/r/innodb_virtual_basic.result10
-rw-r--r--mysql-test/suite/gcol/t/innodb_virtual_basic.test8
2 files changed, 18 insertions, 0 deletions
diff --git a/mysql-test/suite/gcol/r/innodb_virtual_basic.result b/mysql-test/suite/gcol/r/innodb_virtual_basic.result
index e886559a06c..d4c65f96e59 100644
--- a/mysql-test/suite/gcol/r/innodb_virtual_basic.result
+++ b/mysql-test/suite/gcol/r/innodb_virtual_basic.result
@@ -1483,3 +1483,13 @@ SELECT * FROM t1;
a b
f1
DROP TABLE t1;
+CREATE TABLE t1 (a INT GENERATED ALWAYS AS(1) VIRTUAL) ENGINE=InnoDB;
+ALTER TABLE t1 ADD b INT GENERATED ALWAYS AS (2) VIRTUAL;
+ALTER TABLE t1 ADD c INT;
+SELECT * FROM t1;
+a b c
+INSERT INTO t1 SET c=3;
+SELECT * FROM t1;
+a b c
+1 2 3
+DROP TABLE t1;
diff --git a/mysql-test/suite/gcol/t/innodb_virtual_basic.test b/mysql-test/suite/gcol/t/innodb_virtual_basic.test
index aa2e1e00c8f..72f4c6dc8c4 100644
--- a/mysql-test/suite/gcol/t/innodb_virtual_basic.test
+++ b/mysql-test/suite/gcol/t/innodb_virtual_basic.test
@@ -1430,3 +1430,11 @@ INSERT INTO t1(a) VALUES ('');
ALTER TABLE t1 CHANGE COLUMN a a VARCHAR(85);
SELECT * FROM t1;
DROP TABLE t1;
+
+CREATE TABLE t1 (a INT GENERATED ALWAYS AS(1) VIRTUAL) ENGINE=InnoDB;
+ALTER TABLE t1 ADD b INT GENERATED ALWAYS AS (2) VIRTUAL;
+ALTER TABLE t1 ADD c INT;
+SELECT * FROM t1;
+INSERT INTO t1 SET c=3;
+SELECT * FROM t1;
+DROP TABLE t1;