diff options
| author | unknown <knielsen@knielsen-hq.org> | 2010-10-27 10:41:45 +0200 |
|---|---|---|
| committer | unknown <knielsen@knielsen-hq.org> | 2010-10-27 10:41:45 +0200 |
| commit | 4cb9a326cfc286a3e57f5f3901b14ad9064d8557 (patch) | |
| tree | 45e15fedaf34426470bc1d6a5eb7d71483923f14 | |
| parent | 1d8ad7e54ce672b2bfa28cc1e0cdef3aee3e8eb1 (diff) | |
| download | mariadb-git-4cb9a326cfc286a3e57f5f3901b14ad9064d8557.tar.gz | |
Fix test failure (timeout) in --valgrind tests in Buildbot.
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.
| -rw-r--r-- | mysql-test/r/ps_ddl.result | 1 | ||||
| -rw-r--r-- | mysql-test/t/ps_ddl.test | 4 |
2 files changed, 5 insertions, 0 deletions
diff --git a/mysql-test/r/ps_ddl.result b/mysql-test/r/ps_ddl.result index 375f31ef9c4..a5e71e114ca 100644 --- a/mysql-test/r/ps_ddl.result +++ b/mysql-test/r/ps_ddl.result @@ -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; diff --git a/mysql-test/t/ps_ddl.test b/mysql-test/t/ps_ddl.test index 1543c757908..10a96285451 100644 --- a/mysql-test/t/ps_ddl.test +++ b/mysql-test/t/ps_ddl.test @@ -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 |