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/main/merge-big.test | |
| 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/main/merge-big.test')
| -rw-r--r-- | mysql-test/main/merge-big.test | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/mysql-test/main/merge-big.test b/mysql-test/main/merge-big.test index 9bd2cab2c8a..5873d2eb233 100644 --- a/mysql-test/main/merge-big.test +++ b/mysql-test/main/merge-big.test @@ -42,7 +42,7 @@ LOCK TABLE t1 WRITE; #SELECT NOW(); connect (con1,localhost,root,,); let $con1_id= `SELECT CONNECTION_ID()`; - SET @orig_debug=@@debug; + SET @orig_debug=@@global.debug_dbug; SET GLOBAL debug_dbug="+d,sleep_open_and_lock_after_open"; send INSERT INTO t1 VALUES (1); connection default; |