1berry/MariaDB-server
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

MDEV-17813: Fix the test for release builds

Browse Source
This commit is contained in:
Marko Mäkelä 2018-11-23 18:36:44 +02:00
parent 2c4844c9e7
commit 27f3329ff6
2 changed files with 30 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
mysql-test/suite/innodb/r/instant_alter_purge,release.rdiff Normal file
View File

@ -0,0 +1,18 @@
--- instant_alter_purge.result
+++ instant_alter_purge,release.result
@@ -32,15 +32,11 @@
START TRANSACTION WITH CONSISTENT SNAPSHOT;
connection default;
DELETE FROM t1;
-SET DEBUG_SYNC='innodb_commit_inplace_alter_table_enter SIGNAL go WAIT_FOR do';
ALTER TABLE t1 ADD COLUMN f3 INT;
connection purge_control;
-SET DEBUG_SYNC='now WAIT_FOR go';
COMMIT;
InnoDB 0 transactions not purged
-SET DEBUG_SYNC='now SIGNAL do';
disconnect purge_control;
connection default;
-SET DEBUG_SYNC=RESET;
DROP TABLE t1;
SET GLOBAL innodb_purge_rseg_truncate_frequency = @saved_frequency;

12
mysql-test/suite/innodb/t/instant_alter_purge.test
View File

@ -1,4 +1,8 @@
--source include/have_innodb.inc --source include/have_innodb.inc
--source include/maybe_debug.inc
if ($have_debug) {
--source include/have_debug_sync.inc
}
SET @saved_frequency = @@GLOBAL.innodb_purge_rseg_truncate_frequency; SET @saved_frequency = @@GLOBAL.innodb_purge_rseg_truncate_frequency;
SET GLOBAL innodb_purge_rseg_truncate_frequency=1; SET GLOBAL innodb_purge_rseg_truncate_frequency=1;
@ -45,19 +49,27 @@ START TRANSACTION WITH CONSISTENT SNAPSHOT;
connection default; connection default;
DELETE FROM t1; DELETE FROM t1;
if ($have_debug) {
SET DEBUG_SYNC='innodb_commit_inplace_alter_table_enter SIGNAL go WAIT_FOR do'; SET DEBUG_SYNC='innodb_commit_inplace_alter_table_enter SIGNAL go WAIT_FOR do';
}
send ALTER TABLE t1 ADD COLUMN f3 INT; send ALTER TABLE t1 ADD COLUMN f3 INT;
connection purge_control; connection purge_control;
if ($have_debug) {
SET DEBUG_SYNC='now WAIT_FOR go'; SET DEBUG_SYNC='now WAIT_FOR go';
}
COMMIT; COMMIT;
--source include/wait_all_purged.inc --source include/wait_all_purged.inc
if ($have_debug) {
SET DEBUG_SYNC='now SIGNAL do'; SET DEBUG_SYNC='now SIGNAL do';
}
disconnect purge_control; disconnect purge_control;
connection default; connection default;
reap; reap;
if ($have_debug) {
SET DEBUG_SYNC=RESET; SET DEBUG_SYNC=RESET;
}
DROP TABLE t1; DROP TABLE t1;
SET GLOBAL innodb_purge_rseg_truncate_frequency = @saved_frequency; SET GLOBAL innodb_purge_rseg_truncate_frequency = @saved_frequency;