Commit 23652768 authored by Michael Widenius's avatar Michael Widenius

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
parent c8b3cd4a
...@@ -4015,7 +4015,10 @@ sub extract_warning_lines ($) { ...@@ -4015,7 +4015,10 @@ sub extract_warning_lines ($) {
qr/Slave I\/O: Get master COLLATION_SERVER failed with error:.*/, qr/Slave I\/O: Get master COLLATION_SERVER failed with error:.*/,
qr/Slave I\/O: Get master TIME_ZONE failed with error:.*/, qr/Slave I\/O: Get master TIME_ZONE failed with error:.*/,
qr/Slave I\/O: error reconnecting to master '.*' - retry-time: [1-3] retries/, qr/Slave I\/O: error reconnecting to master '.*' - retry-time: [1-3] retries/,
qr/Slave I\/0: Master command COM_BINLOG_DUMP failed/,
qr/Error reading packet/, qr/Error reading packet/,
qr/Lost connection to MySQL server at 'reading initial communication packet'/,
qr/Failed on request_dump/,
qr/Slave: Can't drop database.* database doesn't exist/, qr/Slave: Can't drop database.* database doesn't exist/,
qr/Slave: Operation DROP USER failed for 'create_rout_db'/, qr/Slave: Operation DROP USER failed for 'create_rout_db'/,
qr|Checking table: '\./mtr/test_suppressions'|, qr|Checking table: '\./mtr/test_suppressions'|,
......
...@@ -89,18 +89,38 @@ USE information_schema; ...@@ -89,18 +89,38 @@ USE information_schema;
--echo 1 Prepare test. --echo 1 Prepare test.
--echo connection default (user=root) --echo connection default (user=root)
--echo #################################################################################### --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. dec $counter;
--echo Expectation: USER HOST DB COMMAND STATE INFO let $res= `SELECT COUNT(*) <> 1 FROM processlist`;
--echo Expectation: root localhost information_schema Query executing SELECT USER,HOST,DB,COMMAND,STATE,INFO FROM processlist ORDER BY ID if (!$res)
--echo But we found in the moment: {
SELECT USER,HOST,DB,COMMAND,STATE,INFO FROM processlist ORDER BY ID; # Success; Abort while loop
--echo Maybe let $counter=0;
--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 if ($res)
--echo We cannot proceed in this situation. Abort {
exit; --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 #################################################################################### --echo ####################################################################################
......
...@@ -30,7 +30,7 @@ connection con1; ...@@ -30,7 +30,7 @@ connection con1;
--send --send
update t1 set n = 3; update t1 set n = 3;
connection con2; connection con2;
sleep 0.5; sleep 5;
unlock tables; unlock tables;
connection con1; connection con1;
reap; reap;
......
...@@ -40,7 +40,7 @@ sync/sync0sync\.c: unused parameter ...@@ -40,7 +40,7 @@ sync/sync0sync\.c: unused parameter
sync/sync0sync\.c: unused variable sync/sync0sync\.c: unused variable
ut/ut0ut\.c: ignoring return value of ut/ut0ut\.c: ignoring return value of
srv/srv0srv\.c: value computed is not used srv/srv0srv\.c: value computed is not used
buf/buf0buf\.c: warning: .*block_mutex.* might be used uninitialized buf/buf0buf\.c: .*block_mutex.* might be used uninitialized
# #
# bdb is not critical to keep up to date # bdb is not critical to keep up to date
......
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