diff options
author | Sergei Petrunia <psergey@askmonty.org> | 2020-01-17 00:46:40 +0300 |
---|---|---|
committer | Sergei Petrunia <psergey@askmonty.org> | 2020-01-17 00:46:40 +0300 |
commit | e709eb9bf712006d070767629518f827cd2f6bed (patch) | |
tree | 103290899cbe2a67f78277e0e33486e51ef01717 /mysql-test/main/merge-big.test | |
parent | d531b4ee3a9bcd89a2fa6b49a2207eaf966f53e3 (diff) | |
parent | b04429434ad1ee7f49d263762a560f4ff31dd111 (diff) | |
download | mariadb-git-e709eb9bf712006d070767629518f827cd2f6bed.tar.gz |
Merge branch '10.2' into 10.3
# Conflicts:
# mysql-test/suite/galera/r/MW-388.result
# mysql-test/suite/galera/t/MW-388.test
# mysql-test/suite/innodb/r/truncate_inject.result
# mysql-test/suite/innodb/t/truncate_inject.test
# mysql-test/suite/rpl/r/rpl_stop_slave.result
# mysql-test/suite/rpl/t/rpl_stop_slave.test
# sql/sp_head.cc
# sql/sp_head.h
# sql/sql_lex.cc
# sql/sql_yacc.yy
# storage/xtradb/buf/buf0dblwr.cc
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; |