5.5 merge

1 files changed, 13 insertions, 1 deletions

diff --git a/mysql-test/t/log_slow.test b/mysql-test/t/log_slow.test
index af8a948d318..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";
@@ -42,7 +43,18 @@ show fields from mysql.slow_log;
 
 flush slow logs;
 
-# Reset used variables
+# MDEV-4206 (empty filter should be no filter)
+set long_query_time=0.1;
+set log_slow_filter='';
+set global slow_query_log=1;
+set global log_output='TABLE';
+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= @org_slow_query_log;
 set @@log_slow_filter=default;
 set @@log_slow_verbosity=default;
+set global log_output= default;