mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2026-04-20 15:25:33 +02:00
Code Issues Projects Releases Packages Wiki Activity

Fix test failure (timeout) in --valgrind tests in Buildbot.

Browse source 
The main.ps_ddl test does SELECT * FROM mysql.general_log; that can be really
expensive with --valgrind if previous test cases put lots of data in the
general log since last server restart. Fix by truncating the log at test start.
This commit is contained in:
unknown 2010-10-27 10:41:45 +02:00
commit 4cb9a326cf
2 changed files with 5 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

1
mysql-test/r/ps_ddl.result
View file

@ -4,6 +4,7 @@ drop procedure if exists p_verify_reprepare_count;
drop procedure if exists p1;
drop function if exists f1;
drop view if exists v1, v2;
TRUNCATE TABLE mysql.general_log;
create procedure p_verify_reprepare_count(expected int)
begin
declare old_reprepare_count int default @reprepare_count;

4
mysql-test/t/ps_ddl.test
View file

@ -58,6 +58,10 @@ drop function if exists f1;
drop view if exists v1, v2;
--enable_warnings
# Avoid selecting from a huge table possibly left over from previous tests,
# as this really hurts --valgrind testing.
TRUNCATE TABLE mysql.general_log;
delimiter |;
create procedure p_verify_reprepare_count(expected int)
begin