diff options
| author | Elena Stepanova <elenst@montyprogram.com> | 2017-01-04 03:33:39 +0200 |
|---|---|---|
| committer | Elena Stepanova <elenst@montyprogram.com> | 2017-01-04 03:33:39 +0200 |
| commit | 0912fbbce179cba38bd41de797ba5934e63dbaad (patch) | |
| tree | de4d5c1344601852a173c7133c259644895299b2 | |
| parent | 2718225b2626eeb8df9ab71547a81e43104d52ab (diff) | |
| download | mariadb-git-0912fbbce179cba38bd41de797ba5934e63dbaad.tar.gz | |
MDEV-11719 main.subselect_no_exists_to_in failed in buildbot
main.log_slow might leave mysql.slow_log table non-empty,
and tests which later use it might fail. Make sure that the table
is properly truncated
| -rw-r--r-- | mysql-test/r/log_slow.result | 2 | ||||
| -rw-r--r-- | mysql-test/t/log_slow.test | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/mysql-test/r/log_slow.result b/mysql-test/r/log_slow.result index 89846dc698c..b396de8a3d8 100644 --- a/mysql-test/r/log_slow.result +++ b/mysql-test/r/log_slow.result @@ -67,9 +67,9 @@ sleep(0.5) select count(*) FROM mysql.slow_log; count(*) 1 -truncate mysql.slow_log; 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; +truncate mysql.slow_log; diff --git a/mysql-test/t/log_slow.test b/mysql-test/t/log_slow.test index 8d5a09d7a94..56e35bd5a20 100644 --- a/mysql-test/t/log_slow.test +++ b/mysql-test/t/log_slow.test @@ -50,7 +50,6 @@ 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; @@ -58,3 +57,4 @@ set global slow_query_log= @org_slow_query_log; set @@log_slow_filter=default; set @@log_slow_verbosity=default; set global log_output= default; +truncate mysql.slow_log; |