summaryrefslogtreecommitdiff
path: root/mysql-test/suite/sys_vars/t/slow_query_log_func.test
diff options
context:
space:
mode:
authorMonty <monty@mariadb.org>2014-08-03 15:26:47 +0300
committerMonty <monty@mariadb.org>2014-08-09 13:22:01 +0300
commite2b2bde358f434d945e9730acfbc6eedeb9ab8a2 (patch)
treef7309ce86e95b4f4bd20e84065fe892e83a0f625 /mysql-test/suite/sys_vars/t/slow_query_log_func.test
parent7375f025ee9cd39909c1ec5529ca8c4007b92368 (diff)
downloadmariadb-git-e2b2bde358f434d945e9730acfbc6eedeb9ab8a2.tar.gz
Made sql_log_slow a session variable
mysqldump: - Added --log-queries to allow one to disable logging for the dump sql/log_event.cc: - Removed setting of enable_slow_log as it's not required anymore. sql/sql_parse.cc: - Set enable_slow_log to value of thd->variables.sql_log_slow as this will speed up tests if slow log is disabled. - opt_log_slow_admin_statements can now only disable slow log, not enable it. sql/sql_explain.cc: - Minor cleanup Other things: - Added sql_log_slow to system variables. - Changed opt_slow_log to global_system_variables.sql_log_slow in all files - Updated tests to reflect changes
Diffstat (limited to 'mysql-test/suite/sys_vars/t/slow_query_log_func.test')
-rw-r--r--mysql-test/suite/sys_vars/t/slow_query_log_func.test15
1 files changed, 13 insertions, 2 deletions
diff --git a/mysql-test/suite/sys_vars/t/slow_query_log_func.test b/mysql-test/suite/sys_vars/t/slow_query_log_func.test
index dd202ec20ff..2f1d7449976 100644
--- a/mysql-test/suite/sys_vars/t/slow_query_log_func.test
+++ b/mysql-test/suite/sys_vars/t/slow_query_log_func.test
@@ -10,7 +10,7 @@ SET @@session.long_query_time=1;
SET @@global.log_output = 'TABLE';
#=========================================
---echo '----When slow_query_log = OFF----'
+--echo '----When global.slow_query_log = OFF----'
#=========================================
SET @@global.slow_query_log = OFF;
@@ -21,7 +21,7 @@ SELECT sleep(2);
SELECT count(*) FROM mysql.slow_log;
#=========================================
---echo '----When slow_query_log = ON-----'
+--echo '----When global.slow_query_log = ON-----'
#=========================================
SET @@global.slow_query_log = ON;
@@ -31,6 +31,17 @@ SELECT sleep(2);
SELECT count(*) > 0 FROM mysql.slow_log;
+#=========================================
+--echo '----When local.slow_query_log = OFF-----'
+#=========================================
+
+SET @@local.slow_query_log = OFF;
+TRUNCATE mysql.slow_log;
+# The sleep is the slow query
+SELECT sleep(2);
+
+SELECT count(*) FROM mysql.slow_log;
+SET @@local.slow_query_log = ON;
#==========================================================================
--echo 'Bug#47905 stored procedures not logged correctly to slow query log'