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/log_slow_debug.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/log_slow_debug.test')
-rw-r--r-- | mysql-test/main/log_slow_debug.test | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/mysql-test/main/log_slow_debug.test b/mysql-test/main/log_slow_debug.test index 6b7cdd62f8a..aba4cbc8dcb 100644 --- a/mysql-test/main/log_slow_debug.test +++ b/mysql-test/main/log_slow_debug.test @@ -9,7 +9,7 @@ SET @@GLOBAL.log_output='TABLE'; FLUSH SLOW LOGS; SET @@GLOBAL.slow_query_log=ON; SET @@GLOBAL.log_slow_admin_statements=ON; -SET @save_dbug = @@debug_dbug; +SET @saved_dbug = @@debug_dbug; SET SESSION debug_dbug="+d,simulate_slow_query"; DELIMITER $$; @@ -87,7 +87,7 @@ CALL show_slow_log(); --echo # Clean up --echo # -SET SESSION debug_dbug=@save_dbug; +SET SESSION debug_dbug=@saved_dbug; TRUNCATE mysql.slow_log; SET @@global.slow_query_log= @org_slow_query_log; SET @@global.log_output= @org_log_output; |