mirror of
https://github.com/MariaDB/server.git
synced 2025-01-25 00:04:33 +01:00
1cae1af6f9
* remove old 5.2+ InnoDB support for virtual columns
* enable corresponding parts of the innodb-5.7 sources
* copy corresponding test cases from 5.7
* copy detailed Alter_inplace_info::HA_ALTER_FLAGS flags from 5.7
- and more detailed detection of changes in fill_alter_inplace_info()
* more "innodb compatibility hooks" in sql_class.cc to
- create/destroy/reset a THD (used by background purge threads)
- find a prelocked table by name
- open a table (from a background purge thread)
* different from 5.7:
- new service thread "thd_destructor_proxy" to make sure all THDs are
destroyed at the correct point in time during the server shutdown
- proper opening/closing of tables for vcol evaluations in
+ FK checks (use already opened prelocked tables)
+ purge threads (open the table, MDLock it, add it to tdc, close
when not needed)
- cache open tables in vc_templ
- avoid unnecessary allocations, reuse table->record[0] and table->s->default_values
- not needed in 5.7, because it overcalculates:
+ tell the server to calculate vcols for an on-going inline ADD INDEX
+ calculate vcols for correct error messages
* update other engines (mroonga/tokudb) accordingly
138 lines
3.2 KiB
Text
138 lines
3.2 KiB
Text
--source include/have_innodb.inc
|
|
--source include/count_sessions.inc
|
|
|
|
--echo #
|
|
--echo # Bug#21869656 UNDO LOG DOES NOT CONTAIN ENOUGH INFORMATION
|
|
--echo # ON INDEXED VIRTUAL COLUMNS
|
|
--echo #
|
|
|
|
CREATE TABLE t1 (a INT, b INT,
|
|
a1 INT GENERATED ALWAYS AS (a) VIRTUAL, INDEX(a1)
|
|
) ENGINE=InnoDB;
|
|
|
|
INSERT INTO t1 (a,b) VALUES(1,1);
|
|
|
|
connect (con1,localhost,root,,);
|
|
# disable purge
|
|
CREATE TABLE t0 (a INT) ENGINE=InnoDB;
|
|
BEGIN; SELECT * FROM t0;
|
|
|
|
connection default;
|
|
# write the problematic update_undo log record
|
|
UPDATE t1 SET a=0;
|
|
|
|
ALTER TABLE t1 DROP COLUMN a1, ALGORITHM=INPLACE;
|
|
ALTER TABLE t1 ADD COLUMN b1 INT GENERATED ALWAYS AS (b) VIRTUAL, ADD
|
|
INDEX(b1),
|
|
ALGORITHM=INPLACE;
|
|
|
|
connection con1;
|
|
# enable purge
|
|
COMMIT;
|
|
UPDATE t1 SET a=1;
|
|
|
|
connection default;
|
|
# wait for purge to process the update_undo record.
|
|
--source include/wait_innodb_all_purged.inc
|
|
|
|
CHECK TABLE t1;
|
|
SELECT b1 FROM t1;
|
|
|
|
|
|
# Create multi-virtual column, more ADD/DROP to test it
|
|
ALTER TABLE t1
|
|
ADD COLUMN a1 INT GENERATED ALWAYS AS (a) VIRTUAL,
|
|
ADD COLUMN a2 INT GENERATED ALWAYS AS (a + b) VIRTUAL,
|
|
ADD COLUMN a3 INT GENERATED ALWAYS AS (a - b) VIRTUAL,
|
|
ADD COLUMN a4 INT GENERATED ALWAYS AS (a - b) VIRTUAL,
|
|
ADD INDEX(a1), ADD INDEX(a2), ADD INDEX(a3), ALGORITHM=INPLACE;
|
|
|
|
CREATE TABLE t2 (
|
|
a BLOB,
|
|
b BLOB,
|
|
c BLOB GENERATED ALWAYS AS (CONCAT(a,b)) VIRTUAL,
|
|
h VARCHAR(10) DEFAULT NULL
|
|
) ENGINE=InnoDB;
|
|
|
|
INSERT INTO t2 VALUES (REPEAT('g', 16000), REPEAT('x', 16000), DEFAULT, 'kk');
|
|
|
|
INSERT INTO t2 VALUES (REPEAT('a', 16000), REPEAT('b', 16000), DEFAULT, 'mm');
|
|
|
|
CREATE INDEX idx ON t2(c(100));
|
|
|
|
INSERT INTO t1 (a, b) VALUES(1,1);
|
|
|
|
connection con1;
|
|
# disable purge
|
|
BEGIN; SELECT * FROM t0;
|
|
|
|
connection default;
|
|
--enable_info
|
|
|
|
# write the problematic update_undo log record
|
|
UPDATE t1 SET a=0;
|
|
UPDATE t1 SET b=0;
|
|
|
|
ALTER TABLE t1 DROP COLUMN a3, ALGORITHM=INPLACE;
|
|
|
|
UPDATE t1 SET a=2;
|
|
ALTER TABLE t1 DROP COLUMN a2, ALGORITHM=INPLACE;
|
|
UPDATE t1 SET b=3;
|
|
|
|
ALTER TABLE t1 ADD COLUMN b2 INT GENERATED ALWAYS AS (b) VIRTUAL,
|
|
ADD INDEX(b2), ALGORITHM=INPLACE;
|
|
UPDATE t1 SET b=9;
|
|
|
|
ALTER TABLE t1 ADD COLUMN b3 INT GENERATED ALWAYS AS (a) VIRTUAL,
|
|
ADD INDEX(b3), ALGORITHM=INPLACE;
|
|
|
|
UPDATE t1 SET b=10;
|
|
|
|
ALTER TABLE t2 DROP COLUMN c;
|
|
|
|
UPDATE t2 SET a = REPEAT('s', 6000) WHERE a like 'aaa%';
|
|
|
|
ALTER TABLE t2 ADD COLUMN x1 BLOB GENERATED ALWAYS AS (CONCAT(a,b)) VIRTUAL,
|
|
ADD COLUMN x2 BLOB GENERATED ALWAYS AS (CONCAT(a,b)) VIRTUAL,
|
|
ADD INDEX(x1(100), x2(120)), ADD INDEX (x1(20));
|
|
|
|
UPDATE t1 SET a=5;
|
|
|
|
UPDATE t2 SET a = REPEAT('m', 16000) WHERE a like 'sss%';
|
|
|
|
ALTER TABLE t1 DROP COLUMN b2, ALGORITHM=INPLACE;
|
|
|
|
UPDATE t1 SET a=6;
|
|
|
|
ALTER TABLE t2 DROP COLUMN x1, DROP COLUMN x2, ALGORITHM=INPLACE;
|
|
|
|
UPDATE t2 SET a = REPEAT('x', 1000) WHERE a like 'mmm%';
|
|
|
|
ALTER TABLE t1 DROP INDEX b3;
|
|
UPDATE t1 SET a=100;
|
|
--disable_info
|
|
|
|
connection con1;
|
|
# enable purge
|
|
COMMIT;
|
|
disconnect con1;
|
|
|
|
connection default;
|
|
# wait for purge to process the update_undo record.
|
|
--source include/wait_innodb_all_purged.inc
|
|
|
|
CHECK TABLE t1;
|
|
SELECT b1 FROM t1;
|
|
|
|
SELECT * FROM t1;
|
|
CHECK TABLE t2;
|
|
DROP TABLE t2, t1, t0;
|
|
|
|
CREATE TABLE t1 (a VARCHAR(30), b INT, a2 VARCHAR(30) GENERATED ALWAYS AS (a) VIRTUAL);
|
|
|
|
--error ER_DUP_FIELDNAME
|
|
CREATE INDEX idx ON t1(a2(10), b, a2(20));
|
|
|
|
DROP TABLE t1;
|
|
|
|
--source include/wait_until_count_sessions.inc
|