summaryrefslogtreecommitdiff
path: root/mysql-test/t/log_slow.test
diff options
context:
space:
mode:
authorMichael Widenius <monty@askmonty.org>2013-05-11 20:31:50 +0300
committerMichael Widenius <monty@askmonty.org>2013-05-11 20:31:50 +0300
commit0737932b907214221bdf1b6fc1eec1d0d98bbfde (patch)
tree9e74ec59f5fde9dabadac3a2bf64f8a27082f7c8 /mysql-test/t/log_slow.test
parent5b31f8785840d63e6a2516758bcd68ac1307d7a7 (diff)
downloadmariadb-git-0737932b907214221bdf1b6fc1eec1d0d98bbfde.tar.gz
Fixed that SHOW PROCESSLIST and information_schema.processlist uses the right length for user names.
Fixed some failing tests mysql-test/mysql-test-run.pl: Removed warning from mysql-test-run mysql-test/r/create.result: Updated result mysql-test/r/log_slow.result: Fixed failing test mysql-test/suite/funcs_1/r/is_columns_is.result: Updated result mysql-test/suite/funcs_1/r/processlist_priv_no_prot.result: Updated result mysql-test/suite/funcs_1/r/processlist_val_no_prot.result: Updated result mysql-test/t/log_slow.test: Ensure variables are properly reset at end of test sql/sql_show.cc: Fixed max length for user names
Diffstat (limited to 'mysql-test/t/log_slow.test')
-rw-r--r--mysql-test/t/log_slow.test5
1 files changed, 3 insertions, 2 deletions
diff --git a/mysql-test/t/log_slow.test b/mysql-test/t/log_slow.test
index 54f56e1bdfc..8d5a09d7a94 100644
--- a/mysql-test/t/log_slow.test
+++ b/mysql-test/t/log_slow.test
@@ -6,6 +6,7 @@ select @@log_slow_filter;
select @@log_slow_rate_limit;
select @@log_slow_verbosity;
show variables like "log_slow%";
+set @org_slow_query_log= @@global.slow_query_log;
# Some simple test to set log_slow_filter
set @@log_slow_filter= "filesort,filesort_on_disk,full_join,full_scan,query_cache,query_cache_miss,tmp_table,tmp_table_on_disk,admin";
@@ -51,9 +52,9 @@ select sleep(0.5);
select count(*) FROM mysql.slow_log;
truncate mysql.slow_log;
-
# Reset used variables
set @@long_query_time=default;
-set global slow_query_log=default;
+set global slow_query_log= @org_slow_query_log;
set @@log_slow_filter=default;
set @@log_slow_verbosity=default;
+set global log_output= default;