Commit 977d7a75 authored by Marko Mäkelä's avatar Marko Mäkelä

Merge 10.2 into 10.3

parents 84973437 e3f44d8d
...@@ -1483,3 +1483,13 @@ SELECT * FROM t1; ...@@ -1483,3 +1483,13 @@ SELECT * FROM t1;
a b a b
f1 f1
DROP TABLE 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;
a b c
INSERT INTO t1 SET c=3;
SELECT * FROM t1;
a b c
1 2 3
DROP TABLE t1;
...@@ -1430,3 +1430,11 @@ INSERT INTO t1(a) VALUES (''); ...@@ -1430,3 +1430,11 @@ INSERT INTO t1(a) VALUES ('');
ALTER TABLE t1 CHANGE COLUMN a a VARCHAR(85); ALTER TABLE t1 CHANGE COLUMN a a VARCHAR(85);
SELECT * FROM t1; SELECT * FROM t1;
DROP TABLE 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;
...@@ -3280,7 +3280,6 @@ innobase_build_col_map( ...@@ -3280,7 +3280,6 @@ innobase_build_col_map(
& INNOBASE_DEFAULTS)); & INNOBASE_DEFAULTS));
DBUG_ASSERT(!defaults || dtuple_get_n_fields(defaults) DBUG_ASSERT(!defaults || dtuple_get_n_fields(defaults)
== dict_table_get_n_cols(new_table)); == dict_table_get_n_cols(new_table));
DBUG_ASSERT(table->s->stored_fields > 0);
const uint old_n_v_cols = uint(table->s->fields const uint old_n_v_cols = uint(table->s->fields
- table->s->stored_fields); - table->s->stored_fields);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment