database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-08-08 11:22:35 +03:00
Code Activity

MDEV-19085: Remove a bogus debug assertion

Browse Source 
MariaDB does support InnoDB tables with no stored columns.
(They are necessarily empty.)
This commit is contained in:
Marko Mäkelä
2019-04-02 16:40:27 +03:00
parent 5633f83ca4
commit e3f44d8d0e
3 changed files with 18 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1485,3 +1485,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;

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

@@ -1429,3 +1429,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;

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

@@ -3022,7 +3022,6 @@ innobase_build_col_map(
& Alter_inplace_info::ADD_COLUMN)); & Alter_inplace_info::ADD_COLUMN));
DBUG_ASSERT(!add_cols || dtuple_get_n_fields(add_cols) DBUG_ASSERT(!add_cols || dtuple_get_n_fields(add_cols)
== 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);