#At bzr+ssh://bk-internal.mysql.com/bzrroot/server/mysql-6.0-sea
2697 Serge Kozlov 2008-09-15
Bug#38070. Set innodb_lock_wait_timeout to 5 instead 1 because
lock wait timeout exceeded too often.
modified:
mysql-test/suite/rpl/t/disabled.def
mysql-test/suite/rpl/t/rpl_locktrans_innodb-master.opt
mysql-test/suite/rpl/t/rpl_locktrans_innodb-slave.opt
=== modified file 'mysql-test/suite/rpl/t/disabled.def'
--- a/mysql-test/suite/rpl/t/disabled.def 2008-09-07 00:58:02 +0000
+++ b/mysql-test/suite/rpl/t/disabled.def 2008-09-15 09:42:38 +0000
@@ -30,7 +30,6 @@ rpl_heartbeat : Bug#37714 2
rpl_idempotency : Bug#37767 2008-07-14 alik Disabled to make 6.0 greaner (the test fails too often)
rpl_flushlog_loop : Bug#37733 2008-07-17 alik Disabled to make 6.0 greaner (the test fails too often)
-rpl_locktrans_innodb : Bug#37712 2008-07-17 alik Disabled to make 6.0 greaner (the test fails too often)
rpl_temporary_errors : Bug#36968 2008-07-17 alik Disabled to make 6.0 greaner (the test fails too often)
rpl_temporary : BUG#38269 2008-07-21 Sven valgrind error in pushbuild
rpl_flushlog_loop : BUG#37733 2008-07-23 Sven disabled in 5.1-bugteam. the bug has been fixed in 5.1-rpl: please re-enable when that gets pushed to main
=== modified file 'mysql-test/suite/rpl/t/rpl_locktrans_innodb-master.opt'
--- a/mysql-test/suite/rpl/t/rpl_locktrans_innodb-master.opt 2008-02-19 12:45:37 +0000
+++ b/mysql-test/suite/rpl/t/rpl_locktrans_innodb-master.opt 2008-09-15 09:42:38 +0000
@@ -1,4 +1,4 @@
---innodb_lock_wait_timeout=1
+--innodb_lock_wait_timeout=5
--log=locktrans_master.log
--log-output=FILE
=== modified file 'mysql-test/suite/rpl/t/rpl_locktrans_innodb-slave.opt'
--- a/mysql-test/suite/rpl/t/rpl_locktrans_innodb-slave.opt 2008-02-19 12:45:37 +0000
+++ b/mysql-test/suite/rpl/t/rpl_locktrans_innodb-slave.opt 2008-09-15 09:42:38 +0000
@@ -1,4 +1,4 @@
---innodb_lock_wait_timeout=1
+--innodb_lock_wait_timeout=5
--log=locktrans_slave.log
--log-output=FILE
