2750 Magnus Svensson 2008-12-10 [merge]
Merge
modified:
mysql-test/include/wait_until_disconnected.inc
2749 Alfranio Correia 2008-12-08
Post-fix for merge 6.0 --> 6.0-rpl (rev:2746).
modified:
mysql-test/lib/mtr_report.pm
mysql-test/suite/backup/r/backup_logs_output.result
mysql-test/suite/backup/t/backup_logs_output.test
=== modified file 'mysql-test/include/wait_until_disconnected.inc'
--- a/mysql-test/include/wait_until_disconnected.inc 2008-04-20 18:24:00 +0000
+++ b/mysql-test/include/wait_until_disconnected.inc 2008-12-10 18:40:27 +0000
@@ -4,7 +4,7 @@
--disable_result_log
--disable_query_log
let $counter= 500;
-let $mysql_errno= 9999;
+let $mysql_errno= 0;
while (!$mysql_errno)
{
--error 0,1053,2002,2006
| Thread |
|---|
| • bzr push into mysql-6.0-rpl branch (msvensson:2749 to 2750) | Magnus Svensson | 10 Dec |