summaryrefslogtreecommitdiff
path: root/mysql-test/suite/funcs_1/datadict
diff options
context:
space:
mode:
authorMichael Widenius <monty@askmonty.org>2010-04-07 18:26:30 +0300
committerMichael Widenius <monty@askmonty.org>2010-04-07 18:26:30 +0300
commitb34262264ab916fd8f261333b6caae6a4e3d17be (patch)
tree1c3c8e4362e8719caac840a408bbc4fb63ba0ae6 /mysql-test/suite/funcs_1/datadict
parent1bee5903474aeac60171c64142ce402b3f695c4e (diff)
downloadmariadb-git-b34262264ab916fd8f261333b6caae6a4e3d17be.tar.gz
Fixed suppression of compiler/test warnings
Fixed some timing issues in test suite mysql-test/mysql-test-run.pl: Added suppression of errors that comes when master is killed before slave has connect (like with rpl_udf.test) mysql-test/suite/funcs_1/datadict/processlist_priv.inc: Wait for check thread to end mysql-test/suite/pbxt/t/status.test: Added longer sleep to avoid timing issue support-files/compiler_warnings.supp: Fixed wrong suppression
Diffstat (limited to 'mysql-test/suite/funcs_1/datadict')
-rw-r--r--mysql-test/suite/funcs_1/datadict/processlist_priv.inc42
1 files changed, 31 insertions, 11 deletions
diff --git a/mysql-test/suite/funcs_1/datadict/processlist_priv.inc b/mysql-test/suite/funcs_1/datadict/processlist_priv.inc
index 9bd8eaedd14..1fffdf014e6 100644
--- a/mysql-test/suite/funcs_1/datadict/processlist_priv.inc
+++ b/mysql-test/suite/funcs_1/datadict/processlist_priv.inc
@@ -89,18 +89,38 @@ USE information_schema;
--echo 1 Prepare test.
--echo connection default (user=root)
--echo ####################################################################################
-if (`SELECT COUNT(*) <> 1 FROM processlist`)
+
+# Check that we have only one connection around.
+# If there is more, it may be the check() connection that has not yet ended,
+# so we wait for it for up to 10 seconds.
+
+let $counter=100;
+while ($counter)
{
- --echo This test expects one connection to the server.
- --echo Expectation: USER HOST DB COMMAND STATE INFO
- --echo Expectation: root localhost information_schema Query executing SELECT USER,HOST,DB,COMMAND,STATE,INFO FROM processlist ORDER BY ID
- --echo But we found in the moment:
- SELECT USER,HOST,DB,COMMAND,STATE,INFO FROM processlist ORDER BY ID;
- --echo Maybe
- --echo - the base configuration (no of parallel auxiliary sessions) of the server has changed
- --echo - a parallel test intended for another server accidently connected to our current one
- --echo We cannot proceed in this situation. Abort
- exit;
+ dec $counter;
+ let $res= `SELECT COUNT(*) <> 1 FROM processlist`;
+ if (!$res)
+ {
+ # Success; Abort while loop
+ let $counter=0;
+ }
+ if ($res)
+ {
+ --sleep 0.1
+ if (!$counter)
+ {
+ --echo This test expects one connection to the server.
+ --echo Expectation: USER HOST DB COMMAND STATE INFO
+ --echo Expectation: root localhost information_schema Query executing SELECT USER,HOST,DB,COMMAND,STATE,INFO FROM processlist ORDER BY ID
+ --echo But we found in the moment:
+ SELECT USER,HOST,DB,COMMAND,STATE,INFO FROM processlist ORDER BY ID;
+ --echo Maybe
+ --echo - the base configuration (no of parallel auxiliary sessions) of the server has changed
+ --echo - a parallel test intended for another server accidently connected to our current one
+ --echo We cannot proceed in this situation. Abort
+ exit;
+ }
+ }
}
--echo ####################################################################################