diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2017-09-14 09:12:47 +0300 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2017-09-14 09:12:47 +0300 |
| commit | 348eaf425216fe927424220b1820da0e383cfa52 (patch) | |
| tree | fb24590627585a4aeab98bbe1b7a1f77bd8d63d5 /mysql-test/suite/innodb_zip | |
| parent | 474f51711b1abbba799d93a0223ef38316b78f6c (diff) | |
| parent | 2bd6ccae72306547fc89199342584cd4d6e9b939 (diff) | |
| download | mariadb-git-348eaf425216fe927424220b1820da0e383cfa52.tar.gz | |
Merge bb-10.2-ext into 10.3
Diffstat (limited to 'mysql-test/suite/innodb_zip')
| -rw-r--r-- | mysql-test/suite/innodb_zip/r/wl5522_debug_zip.result | 9 | ||||
| -rw-r--r-- | mysql-test/suite/innodb_zip/t/wl5522_debug_zip.test | 9 |
2 files changed, 14 insertions, 4 deletions
diff --git a/mysql-test/suite/innodb_zip/r/wl5522_debug_zip.result b/mysql-test/suite/innodb_zip/r/wl5522_debug_zip.result index d20cc452612..394a2ea1f09 100644 --- a/mysql-test/suite/innodb_zip/r/wl5522_debug_zip.result +++ b/mysql-test/suite/innodb_zip/r/wl5522_debug_zip.result @@ -123,7 +123,9 @@ INDEX idx1(c2), INDEX idx2(c3(512)), INDEX idx3(c4(512))) Engine=InnoDB ROW_FORMAT=COMPRESSED; -SET GLOBAL INNODB_PURGE_STOP_NOW=ON; +connect purge_control,localhost,root; +START TRANSACTION WITH CONSISTENT SNAPSHOT; +connection default; SET GLOBAL innodb_disable_background_merge=ON; SET GLOBAL innodb_monitor_reset = ibuf_merges; SET GLOBAL innodb_monitor_reset = ibuf_merges_insert; @@ -288,7 +290,10 @@ FROM information_schema.innodb_metrics WHERE name = 'ibuf_merges_inserts' AND count > 0; name SET GLOBAL innodb_disable_background_merge=OFF; -SET GLOBAL INNODB_PURGE_RUN_NOW=ON; +connection purge_control; +COMMIT; +disconnect purge_control; +connection default; DROP TABLE test_wl5522.t1; CREATE TABLE test_wl5522.t1 ( c1 BIGINT NOT NULL AUTO_INCREMENT PRIMARY KEY, diff --git a/mysql-test/suite/innodb_zip/t/wl5522_debug_zip.test b/mysql-test/suite/innodb_zip/t/wl5522_debug_zip.test index 0898a32fbf5..986c0508891 100644 --- a/mysql-test/suite/innodb_zip/t/wl5522_debug_zip.test +++ b/mysql-test/suite/innodb_zip/t/wl5522_debug_zip.test @@ -321,7 +321,9 @@ CREATE TABLE test_wl5522.t1 ( ROW_FORMAT=COMPRESSED; # Stop purge so that it doesn't remove the delete marked entries. -SET GLOBAL INNODB_PURGE_STOP_NOW=ON; +connect (purge_control,localhost,root); +START TRANSACTION WITH CONSISTENT SNAPSHOT; +connection default; # Disable change buffer merge from the master thread, additionally # enable aggressive flushing so that more changes are buffered. @@ -391,7 +393,10 @@ SELECT name SET GLOBAL innodb_disable_background_merge=OFF; # Enable normal operation -SET GLOBAL INNODB_PURGE_RUN_NOW=ON; +connection purge_control; +COMMIT; +disconnect purge_control; +connection default; DROP TABLE test_wl5522.t1; |