summaryrefslogtreecommitdiff
path: root/mysql-test/t/information_schema.test
diff options
context:
space:
mode:
authorunknown <knielsen@knielsen-hq.org>2010-03-10 10:11:02 +0100
committerunknown <knielsen@knielsen-hq.org>2010-03-10 10:11:02 +0100
commitb1a6297986d59c7d4a13ee7df89b4b7c384aa22b (patch)
tree19f0cecfa5e0967f472c436fb09d21f1b6b3b569 /mysql-test/t/information_schema.test
parent292f6568fa377420c81e0317a26b804057ce208c (diff)
downloadmariadb-git-b1a6297986d59c7d4a13ee7df89b4b7c384aa22b.tar.gz
Fixes for two test failures in Buildbot.
- Adjust timing in test case, to avoid test failures caused by high load on machines and consequent race conditions in the test case. - Add another variant of Valgrind suppressions for memory leak in system libraries when unloading dynamic object files. mysql-test/r/information_schema.result: Adjust timing to avoid test failures due to races. mysql-test/t/information_schema.test: Adjust timing to avoid test failures due to races. mysql-test/valgrind.supp: Add another variant of valgrind suppression for leak in system libs.
Diffstat (limited to 'mysql-test/t/information_schema.test')
-rw-r--r--mysql-test/t/information_schema.test2
1 files changed, 1 insertions, 1 deletions
diff --git a/mysql-test/t/information_schema.test b/mysql-test/t/information_schema.test
index 1298bb89754..2d260616d06 100644
--- a/mysql-test/t/information_schema.test
+++ b/mysql-test/t/information_schema.test
@@ -1114,7 +1114,7 @@ eval SET @tid=$ID;
--enable_query_log
SELECT IF(`time` > 0, 'OK', `time`) AS time_low,
IF(`time` < 1000, 'OK', `time`) AS time_high,
- IF(time_ms > 1500, 'OK', time_ms) AS time_ms_low,
+ IF(time_ms >= 1000, 'OK', time_ms) AS time_ms_low,
IF(time_ms < 1000000, 'OK', time_ms) AS time_ms_high
FROM INFORMATION_SCHEMA.PROCESSLIST
WHERE ID=@tid;