Commit 0fceb752 authored by Monty's avatar Monty Committed by Sergei Golubchik

Fixes for mtr --valgrind

Disabled show_explain when used with valgrind because of random failures
Disable ssl-big when running with --valgrind as it takes more than 1 hour
parent aa1626d1
...@@ -3,7 +3,8 @@ ...@@ -3,7 +3,8 @@
# #
--source include/have_debug.inc --source include/have_debug.inc
--source include/have_innodb.inc --source include/have_innodb.inc
# Using valgrind can cause 'reap' to fail. See comment below
--source include/not_valgrind.inc
--disable_warnings --disable_warnings
drop table if exists t0, t1, t2, t3, t4; drop table if exists t0, t1, t2, t3, t4;
...@@ -885,6 +886,7 @@ let $wait_condition= select State='show explain' from information_schema.process ...@@ -885,6 +886,7 @@ let $wait_condition= select State='show explain' from information_schema.process
evalp kill query $thr_default; evalp kill query $thr_default;
connection default; connection default;
# This may fail when using valgrind
--error ER_QUERY_INTERRUPTED --error ER_QUERY_INTERRUPTED
reap; reap;
......
...@@ -4,6 +4,8 @@ ...@@ -4,6 +4,8 @@
-- source include/have_ssl_communication.inc -- source include/have_ssl_communication.inc
-- source include/big_test.inc -- source include/big_test.inc
-- source include/have_64bit.inc -- source include/have_64bit.inc
# No point in running with valgrind as it takes 1.5 hours
-- source include/not_valgrind.inc
# Save the initial number of concurrent sessions # Save the initial number of concurrent sessions
--source include/count_sessions.inc --source include/count_sessions.inc
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment