1berry/MariaDB-server
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge 10.2 into 10.3

Browse Source
This commit is contained in:
Marko Mäkelä 2019-04-03 08:21:43 +03:00
commit 977d7a7572
3 changed files with 18 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
mysql-test/suite/gcol/r/innodb_virtual_basic.result
View File

@ -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;

8
mysql-test/suite/gcol/t/innodb_virtual_basic.test
View File

@ -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;

1
storage/innobase/handler/handler0alter.cc
View File

@ -3280,7 +3280,6 @@ innobase_build_col_map(
& INNOBASE_DEFAULTS));
DBUG_ASSERT(!defaults || dtuple_get_n_fields(defaults)
== dict_table_get_n_cols(new_table));
DBUG_ASSERT(table->s->stored_fields > 0);
const uint old_n_v_cols = uint(table->s->fields
- table->s->stored_fields);