diff options
| author | Oleksandr Byelkin <sanja@mariadb.com> | 2020-01-24 14:50:23 +0100 |
|---|---|---|
| committer | Oleksandr Byelkin <sanja@mariadb.com> | 2020-01-24 14:50:23 +0100 |
| commit | bfc24bb2ecff2f9a305307086cd4c3c4aae14eaa (patch) | |
| tree | 9b01539207b6c11cba84b83d3ab8e78cd51de79e /mysql-test/suite/binlog/include | |
| parent | 2833e906190e4fa3b0261a204822d419542aebe7 (diff) | |
| parent | ceda5f724fd1ca1bcb6fb113af55179849c057d0 (diff) | |
| download | mariadb-git-bfc24bb2ecff2f9a305307086cd4c3c4aae14eaa.tar.gz | |
Merge branch '10.3' into 10.4
Diffstat (limited to 'mysql-test/suite/binlog/include')
| -rw-r--r-- | mysql-test/suite/binlog/include/binlog_index.inc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/mysql-test/suite/binlog/include/binlog_index.inc b/mysql-test/suite/binlog/include/binlog_index.inc index b930386a0ba..d73091d59ab 100644 --- a/mysql-test/suite/binlog/include/binlog_index.inc +++ b/mysql-test/suite/binlog/include/binlog_index.inc @@ -22,7 +22,7 @@ call mtr.add_suppression('Could not use .*'); call mtr.add_suppression('MYSQL_BIN_LOG::purge_logs failed to clean registers before purging logs.'); flush tables; -let $old=`select @@debug`; +SET @saved_dbug = @@SESSION.debug_dbug; RESET MASTER; @@ -273,6 +273,6 @@ SELECT @index; -- replace_regex /\.[\\\/]master/master/ SELECT @index; -eval SET SESSION debug_dbug="$old"; +SET @@SESSION.debug_dbug = @saved_dbug; --echo End of tests |