database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-07-29 05:21:33 +03:00
Code Activity

Merge 5.5 into 10.1

Browse Source
This commit is contained in:
Marko Mäkelä
2019-10-11 15:19:55 +03:00
parent 5ef1224434 ea61b79694
commit cbfd6882f4
27 changed files with 382 additions and 366 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
mysql-test/r/log_slow_debug.result
View File

@ -6,6 +6,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 SESSION debug_dbug="+d,simulate_slow_query";
CREATE PROCEDURE show_slow_log()
BEGIN
@ -129,7 +130,7 @@ sql_text
#
# Clean up
#
SET SESSION debug_dbug="-d,simulate_slow_query";
SET SESSION debug_dbug=@save_dbug;
TRUNCATE mysql.slow_log;
SET @@global.slow_query_log= @org_slow_query_log;
SET @@global.log_output= @org_log_output;