database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-07-29 05:21:33 +03:00
Code Activity

MDEV-13668 fixup: Remove test work-arounds

Browse Source
This commit is contained in:
Marko Mäkelä
2022-08-31 15:58:52 +03:00
parent c487eeed10
commit 4f2dc716ee
2 changed files with 4 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
mysql-test/suite/innodb/r/innodb-index-online.result
View File

@ -231,7 +231,7 @@ WHERE variable_name = 'innodb_encryption_n_rowlog_blocks_encrypted');
connection con1; connection con1;
SET DEBUG_SYNC = 'row_log_apply_before SIGNAL c2e_created WAIT_FOR dml2_done'; SET DEBUG_SYNC = 'row_log_apply_before SIGNAL c2e_created WAIT_FOR dml2_done';
SET lock_wait_timeout = 10; SET lock_wait_timeout = 10;
ALTER TABLE t1 DROP INDEX c2d, ADD INDEX c2e(c2), ALTER TABLE t1 CHANGE c2 c22 INT, DROP INDEX c2d, ADD INDEX c2e(c22),
ALGORITHM = INPLACE; ALGORITHM = INPLACE;
connection default; connection default;
INSERT INTO t1 SELECT 80 + c1, c2, c3 FROM t1; INSERT INTO t1 SELECT 80 + c1, c2, c3 FROM t1;
@ -353,7 +353,7 @@ SET @rowlog_decrypt_1=
WHERE variable_name = 'innodb_encryption_n_rowlog_blocks_decrypted'); WHERE variable_name = 'innodb_encryption_n_rowlog_blocks_decrypted');
connection con1; connection con1;
SET DEBUG_SYNC = 'row_log_apply_before SIGNAL c2f_created WAIT_FOR dml3_done'; SET DEBUG_SYNC = 'row_log_apply_before SIGNAL c2f_created WAIT_FOR dml3_done';
ALTER TABLE t1 ADD INDEX c2f(c2); ALTER TABLE t1 ADD INDEX c2f(c22f), CHANGE c2 c22f INT;
connection default; connection default;
SET DEBUG_SYNC = 'now WAIT_FOR c2f_created'; SET DEBUG_SYNC = 'now WAIT_FOR c2f_created';
SELECT name, count FROM INFORMATION_SCHEMA.INNODB_METRICS WHERE subsystem = 'ddl'; SELECT name, count FROM INFORMATION_SCHEMA.INNODB_METRICS WHERE subsystem = 'ddl';
@ -392,7 +392,6 @@ SET DEBUG_SYNC = 'now SIGNAL dml3_done';
connection con1; connection con1;
Warnings: Warnings:
Note 1831 Duplicate index `c2f`. This is deprecated and will be disallowed in a future release Note 1831 Duplicate index `c2f`. This is deprecated and will be disallowed in a future release
ALTER TABLE t1 CHANGE c2 c22f INT;
SELECT name, count FROM INFORMATION_SCHEMA.INNODB_METRICS WHERE subsystem = 'ddl'; SELECT name, count FROM INFORMATION_SCHEMA.INNODB_METRICS WHERE subsystem = 'ddl';
name count name count
ddl_background_drop_indexes 0 ddl_background_drop_indexes 0

10
mysql-test/suite/innodb/t/innodb-index-online.test
View File

@ -225,9 +225,7 @@ SET DEBUG_SYNC = 'row_log_apply_before SIGNAL c2e_created WAIT_FOR dml2_done';
# Ensure that the ALTER TABLE will be executed even with some concurrent DML. # Ensure that the ALTER TABLE will be executed even with some concurrent DML.
SET lock_wait_timeout = 10; SET lock_wait_timeout = 10;
--send --send
# FIXME: MDEV-13668 ALTER TABLE t1 CHANGE c2 c22 INT, DROP INDEX c2d, ADD INDEX c2e(c22),
#ALTER TABLE t1 CHANGE c2 c22 INT, DROP INDEX c2d, ADD INDEX c2e(c22),
ALTER TABLE t1 DROP INDEX c2d, ADD INDEX c2e(c2),
ALGORITHM = INPLACE; ALGORITHM = INPLACE;
# Generate some log (delete-mark, delete-unmark, insert etc.) # Generate some log (delete-mark, delete-unmark, insert etc.)
@ -321,9 +319,7 @@ connection con1;
# Accumulate and apply some modification log. # Accumulate and apply some modification log.
SET DEBUG_SYNC = 'row_log_apply_before SIGNAL c2f_created WAIT_FOR dml3_done'; SET DEBUG_SYNC = 'row_log_apply_before SIGNAL c2f_created WAIT_FOR dml3_done';
--send --send
# FIXME: MDEV-13668 ALTER TABLE t1 ADD INDEX c2f(c22f), CHANGE c2 c22f INT;
#ALTER TABLE t1 ADD INDEX c2f(c22f), CHANGE c2 c22f INT;
ALTER TABLE t1 ADD INDEX c2f(c2);
connection default; connection default;
SET DEBUG_SYNC = 'now WAIT_FOR c2f_created'; SET DEBUG_SYNC = 'now WAIT_FOR c2f_created';
@ -348,8 +344,6 @@ SET DEBUG_SYNC = 'now SIGNAL dml3_done';
connection con1; connection con1;
reap; reap;
# FIXME: MDEV-13668
ALTER TABLE t1 CHANGE c2 c22f INT;
eval $innodb_metrics_select; eval $innodb_metrics_select;