mirror of
https://github.com/MariaDB/server.git
synced 2025-02-28 08:13:11 +01:00

This is a backport of the following commits: commitb4165985c9
commit69e88de0fe
commit40f4525f43
commit656f66def2
Now that MDEV-14717 made RENAME TABLE crash-safe within InnoDB, it should be safe to drop the #sql- tables within InnoDB during crash recovery. These tables can be one of two things: (1) #sql-ib related to deferred DROP TABLE (follow-up to MDEV-13407) or to table-rebuilding ALTER TABLE...ALGORITHM=INPLACE (since MDEV-14378, only related to the intermediate copy of a table), (2) #sql- related to the intermediate copy of a table during ALTER TABLE...ALGORITHM=COPY We will not drop tables whose name starts with #sql2, because the server can be killed during an ALGORITHM=COPY operation at a point where the original table was renamed to #sql2 but the finished intermediate copy was not yet renamed from #sql- to the original table name. If an old version of MariaDB Server before 10.2.13 (MDEV-11415) was killed while ALTER TABLE...ALGORITHM=COPY was in progress, after recovery there could be undo log records for some records that were inserted into an intermediate copy of the table. Due to these undo log records, InnoDB would resurrect locks at recovery, and the intermediate table would be locked while we are trying to drop it. This would cause a call to row_rename_table_for_mysql(), either from row_mysql_drop_garbage_tables() or from the rollback of a RENAME operation that was part of the ALTER TABLE. row_rename_table_for_mysql(): Do not attempt to parse FOREIGN KEY constraints when renaming from #sql-something to #sql-something-else, because it does not make any sense. row_drop_table_for_mysql(): When deferring DROP TABLE due to locks, do not rename the table if its name already starts with the #sql- prefix, which is what row_mysql_drop_garbage_tables() uses. Previously, the too strict prefix #sql-ib was used, and some tables were renamed unnecessarily.
213 lines
5.5 KiB
Text
213 lines
5.5 KiB
Text
#
|
|
# MDEV-11415 AVOID INTERMEDIATE COMMIT WHILE DOING
|
|
# ALTER TABLE...ALGORITHM=COPY
|
|
#
|
|
CREATE TABLE t(a SERIAL, b INT, c INT, d INT) ENGINE=InnoDB;
|
|
CREATE TABLE t1(a INT, b TEXT, c TEXT,
|
|
FULLTEXT(b), FULLTEXT(c(3)), FULLTEXT(b,c)) ENGINE=InnoDB;
|
|
BEGIN;
|
|
COMMIT;
|
|
SELECT COUNT(*) FROM t;
|
|
COUNT(*)
|
|
999
|
|
UPDATE t SET b=a%7, c=a%11, d=a%13;
|
|
INSERT INTO t1 VALUES(1, 'This is a first b column', 'This is a first c column');
|
|
INSERT INTO t1 VALUES(2, 'This is a second b column', 'This is a second c column');
|
|
INSERT INTO t1(a) VALUES(3);
|
|
INSERT INTO t1 VALUES(4, 'This is a third b column', 'This is a third c column');
|
|
DELETE FROM t1 WHERE a = 2;
|
|
SELECT * FROM t1 WHERE MATCH(b) AGAINST ('first');
|
|
a b c
|
|
1 This is a first b column This is a first c column
|
|
SELECT * FROM t1 WHERE MATCH(c) AGAINST ('first');
|
|
a b c
|
|
1 This is a first b column This is a first c column
|
|
SELECT * FROM t1 WHERE MATCH(b,c) AGAINST ('column');
|
|
a b c
|
|
1 This is a first b column This is a first c column
|
|
4 This is a third b column This is a third c column
|
|
SHOW CREATE TABLE t1;
|
|
Table Create Table
|
|
t1 CREATE TABLE `t1` (
|
|
`a` int(11) DEFAULT NULL,
|
|
`b` text DEFAULT NULL,
|
|
`c` text DEFAULT NULL,
|
|
FULLTEXT KEY `b` (`b`),
|
|
FULLTEXT KEY `c` (`c`),
|
|
FULLTEXT KEY `b_2` (`b`,`c`)
|
|
) ENGINE=InnoDB DEFAULT CHARSET=latin1
|
|
ALTER TABLE t1 FORCE, ALGORITHM=COPY;
|
|
SET DEBUG_DBUG='+d,crash_commit_before';
|
|
ALTER TABLE t ADD INDEX(b,c,d,a),ADD INDEX(b,c,a,d),ADD INDEX(b,a,c,d),ADD INDEX(b,a,d,c),
|
|
ADD INDEX(b,d,a,c),ADD INDEX(b,d,c,a),ADD INDEX(a,b,c,d),ADD INDEX(a,b,d,c),
|
|
ADD INDEX(a,c,b,d),ADD INDEX(a,c,d,b),ADD INDEX(a,d,b,c),ADD INDEX(a,d,c,b),
|
|
ADD INDEX(c,a,b,d),ADD INDEX(c,a,d,b),ADD INDEX(c,b,a,d),ADD INDEX(c,b,d,a),
|
|
ADD INDEX(c,d,a,b),ADD INDEX(c,d,b,a),ADD INDEX(d,a,b,c),ADD INDEX(d,a,c,b),
|
|
ADD INDEX(d,b,a,c),ADD INDEX(d,b,c,a),ADD INDEX(d,c,a,b),ADD INDEX(d,c,b,a),
|
|
ADD INDEX(a,b,c), ADD INDEX(a,c,b), ADD INDEX(a,c,d), ADD INDEX(a,d,c),
|
|
ADD INDEX(a,b,d), ADD INDEX(a,d,b), ADD INDEX(b,c,d), ADD INDEX(b,d,c),
|
|
ALGORITHM=COPY;
|
|
ERROR HY000: Lost connection to MySQL server during query
|
|
#sql-temporary.frm
|
|
#sql-temporary.ibd
|
|
FTS_INDEX_1.ibd
|
|
FTS_INDEX_2.ibd
|
|
FTS_INDEX_3.ibd
|
|
FTS_INDEX_4.ibd
|
|
FTS_INDEX_5.ibd
|
|
FTS_INDEX_6.ibd
|
|
FTS_INDEX_1.ibd
|
|
FTS_INDEX_2.ibd
|
|
FTS_INDEX_3.ibd
|
|
FTS_INDEX_4.ibd
|
|
FTS_INDEX_5.ibd
|
|
FTS_INDEX_6.ibd
|
|
FTS_INDEX_1.ibd
|
|
FTS_INDEX_2.ibd
|
|
FTS_INDEX_3.ibd
|
|
FTS_INDEX_4.ibd
|
|
FTS_INDEX_5.ibd
|
|
FTS_INDEX_6.ibd
|
|
FTSBEING_DELETED.ibd
|
|
FTSBEING_DELETED_CACHE.ibd
|
|
FTSCONFIG.ibd
|
|
FTSDELETED.ibd
|
|
FTSDELETED_CACHE.ibd
|
|
t.frm
|
|
t.ibd
|
|
t1.frm
|
|
t1.ibd
|
|
SHOW CREATE TABLE t;
|
|
Table Create Table
|
|
t CREATE TABLE `t` (
|
|
`a` bigint(20) unsigned NOT NULL AUTO_INCREMENT,
|
|
`b` int(11) DEFAULT NULL,
|
|
`c` int(11) DEFAULT NULL,
|
|
`d` int(11) DEFAULT NULL,
|
|
UNIQUE KEY `a` (`a`)
|
|
) ENGINE=InnoDB AUTO_INCREMENT=1000 DEFAULT CHARSET=latin1
|
|
SELECT COUNT(*) FROM t;
|
|
COUNT(*)
|
|
999
|
|
CHECK TABLE t;
|
|
Table Op Msg_type Msg_text
|
|
test.t check status OK
|
|
SELECT * FROM t1 WHERE MATCH(b) AGAINST ('first');
|
|
a b c
|
|
1 This is a first b column This is a first c column
|
|
SELECT * FROM t1 WHERE MATCH(c) AGAINST ('first');
|
|
a b c
|
|
1 This is a first b column This is a first c column
|
|
SELECT * FROM t1 WHERE MATCH(b,c) AGAINST ('column');
|
|
a b c
|
|
1 This is a first b column This is a first c column
|
|
4 This is a third b column This is a third c column
|
|
SHOW CREATE TABLE t1;
|
|
Table Create Table
|
|
t1 CREATE TABLE `t1` (
|
|
`a` int(11) DEFAULT NULL,
|
|
`b` text DEFAULT NULL,
|
|
`c` text DEFAULT NULL,
|
|
FULLTEXT KEY `b` (`b`),
|
|
FULLTEXT KEY `c` (`c`),
|
|
FULLTEXT KEY `b_2` (`b`,`c`)
|
|
) ENGINE=InnoDB DEFAULT CHARSET=latin1
|
|
CHECK TABLE t1;
|
|
Table Op Msg_type Msg_text
|
|
test.t1 check status OK
|
|
#sql-temporary.frm
|
|
#sql-temporary.ibd
|
|
FTS_INDEX_1.ibd
|
|
FTS_INDEX_2.ibd
|
|
FTS_INDEX_3.ibd
|
|
FTS_INDEX_4.ibd
|
|
FTS_INDEX_5.ibd
|
|
FTS_INDEX_6.ibd
|
|
FTS_INDEX_1.ibd
|
|
FTS_INDEX_2.ibd
|
|
FTS_INDEX_3.ibd
|
|
FTS_INDEX_4.ibd
|
|
FTS_INDEX_5.ibd
|
|
FTS_INDEX_6.ibd
|
|
FTS_INDEX_1.ibd
|
|
FTS_INDEX_2.ibd
|
|
FTS_INDEX_3.ibd
|
|
FTS_INDEX_4.ibd
|
|
FTS_INDEX_5.ibd
|
|
FTS_INDEX_6.ibd
|
|
FTSBEING_DELETED.ibd
|
|
FTSBEING_DELETED_CACHE.ibd
|
|
FTSCONFIG.ibd
|
|
FTSDELETED.ibd
|
|
FTSDELETED_CACHE.ibd
|
|
t.frm
|
|
t.ibd
|
|
t1.frm
|
|
t1.ibd
|
|
SHOW CREATE TABLE t;
|
|
Table Create Table
|
|
t CREATE TABLE `t` (
|
|
`a` bigint(20) unsigned NOT NULL AUTO_INCREMENT,
|
|
`b` int(11) DEFAULT NULL,
|
|
`c` int(11) DEFAULT NULL,
|
|
`d` int(11) DEFAULT NULL,
|
|
UNIQUE KEY `a` (`a`)
|
|
) ENGINE=InnoDB AUTO_INCREMENT=1000 DEFAULT CHARSET=latin1
|
|
SELECT COUNT(*) FROM t;
|
|
COUNT(*)
|
|
999
|
|
CHECK TABLE t;
|
|
Table Op Msg_type Msg_text
|
|
test.t check status OK
|
|
SELECT * FROM t1 WHERE MATCH(b) AGAINST ('first');
|
|
a b c
|
|
1 This is a first b column This is a first c column
|
|
SELECT * FROM t1 WHERE MATCH(c) AGAINST ('first');
|
|
a b c
|
|
1 This is a first b column This is a first c column
|
|
SELECT * FROM t1 WHERE MATCH(b,c) AGAINST ('column');
|
|
a b c
|
|
1 This is a first b column This is a first c column
|
|
4 This is a third b column This is a third c column
|
|
SHOW CREATE TABLE t1;
|
|
Table Create Table
|
|
t1 CREATE TABLE `t1` (
|
|
`a` int(11) DEFAULT NULL,
|
|
`b` text DEFAULT NULL,
|
|
`c` text DEFAULT NULL,
|
|
FULLTEXT KEY `b` (`b`),
|
|
FULLTEXT KEY `c` (`c`),
|
|
FULLTEXT KEY `b_2` (`b`,`c`)
|
|
) ENGINE=InnoDB DEFAULT CHARSET=latin1
|
|
CHECK TABLE t1;
|
|
Table Op Msg_type Msg_text
|
|
test.t1 check status OK
|
|
#sql-temporary.frm
|
|
FTS_INDEX_1.ibd
|
|
FTS_INDEX_2.ibd
|
|
FTS_INDEX_3.ibd
|
|
FTS_INDEX_4.ibd
|
|
FTS_INDEX_5.ibd
|
|
FTS_INDEX_6.ibd
|
|
FTS_INDEX_1.ibd
|
|
FTS_INDEX_2.ibd
|
|
FTS_INDEX_3.ibd
|
|
FTS_INDEX_4.ibd
|
|
FTS_INDEX_5.ibd
|
|
FTS_INDEX_6.ibd
|
|
FTS_INDEX_1.ibd
|
|
FTS_INDEX_2.ibd
|
|
FTS_INDEX_3.ibd
|
|
FTS_INDEX_4.ibd
|
|
FTS_INDEX_5.ibd
|
|
FTS_INDEX_6.ibd
|
|
FTSBEING_DELETED.ibd
|
|
FTSBEING_DELETED_CACHE.ibd
|
|
FTSCONFIG.ibd
|
|
FTSDELETED.ibd
|
|
FTSDELETED_CACHE.ibd
|
|
t.frm
|
|
t.ibd
|
|
t1.frm
|
|
t1.ibd
|
|
DROP TABLE t1,t;
|