diff options
author | Marko Mäkelä <marko.makela@mariadb.com> | 2020-01-20 15:49:48 +0200 |
---|---|---|
committer | Marko Mäkelä <marko.makela@mariadb.com> | 2020-01-20 15:49:48 +0200 |
commit | 87a61355e8e499baf7908862711c26aa0225bf32 (patch) | |
tree | 7122052c801b5f1ee4a93af2348fad916aa2f86b /mysql-test/suite/gcol | |
parent | 7ea413ac2d80c7f03d1dbad90ac30ecddd8b2835 (diff) | |
parent | bc43bf3e430c20bc2178e584215bd443054709d6 (diff) | |
download | mariadb-git-87a61355e8e499baf7908862711c26aa0225bf32.tar.gz |
Merge 10.3 into 10.4
The MDEV-17062 fix in commit c4195305b2a8431f39a4c75cc1c66ba43685f7a0
was omitted.
Diffstat (limited to 'mysql-test/suite/gcol')
-rw-r--r-- | mysql-test/suite/gcol/r/innodb_virtual_debug_purge.result | 4 | ||||
-rw-r--r-- | mysql-test/suite/gcol/t/innodb_virtual_debug_purge.test | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/mysql-test/suite/gcol/r/innodb_virtual_debug_purge.result b/mysql-test/suite/gcol/r/innodb_virtual_debug_purge.result index d99565b2f4c..837f72129ca 100644 --- a/mysql-test/suite/gcol/r/innodb_virtual_debug_purge.result +++ b/mysql-test/suite/gcol/r/innodb_virtual_debug_purge.result @@ -208,7 +208,7 @@ DROP TABLE t1, t2; # MDEV-16222 Assertion `0' failed in row_purge_remove_sec_if_poss_leaf # on table with virtual columns and indexes # -set @saved_dbug= @@global.debug_dbug; +SET @saved_dbug= @@GLOBAL.debug_dbug; set global debug_dbug= "+d,ib_purge_virtual_mdev_16222_1,ib_purge_virtual_mdev_16222_2"; create table t1 ( pk serial, vb tinyblob as (b) virtual, b tinyblob, @@ -253,7 +253,7 @@ SET GLOBAL innodb_debug_sync = "ib_clust_v_col_before_row_allocated " SET GLOBAL innodb_debug_sync = "ib_open_after_dict_open " "SIGNAL purge_open " "WAIT_FOR select_open"; -set @saved_dbug= @@global.debug_dbug; +SET @saved_dbug= @@GLOBAL.debug_dbug; set global debug_dbug= "+d,ib_purge_virtual_index_callback"; connect purge_waiter,localhost,root; SET debug_sync= "now WAIT_FOR before_row_allocated"; diff --git a/mysql-test/suite/gcol/t/innodb_virtual_debug_purge.test b/mysql-test/suite/gcol/t/innodb_virtual_debug_purge.test index 276407007da..ca9d016fdcc 100644 --- a/mysql-test/suite/gcol/t/innodb_virtual_debug_purge.test +++ b/mysql-test/suite/gcol/t/innodb_virtual_debug_purge.test @@ -265,7 +265,7 @@ DROP TABLE t1, t2; --echo # --let $datadir= `select @@datadir` -set @saved_dbug= @@global.debug_dbug; +SET @saved_dbug= @@GLOBAL.debug_dbug; set global debug_dbug= "+d,ib_purge_virtual_mdev_16222_1,ib_purge_virtual_mdev_16222_2"; create table t1 ( @@ -336,7 +336,7 @@ SET GLOBAL innodb_debug_sync = "ib_open_after_dict_open " # In 10.2 trx_undo_roll_ptr_is_insert(t_roll_ptr) condition never pass in purge, # so this condition is forced to pass in row_vers_old_has_index_entry -set @saved_dbug= @@global.debug_dbug; +SET @saved_dbug= @@GLOBAL.debug_dbug; set global debug_dbug= "+d,ib_purge_virtual_index_callback"; # The purge starts from REPLACE command. To avoid possible race, separate |