From: Bjorn Munch Date: December 20 2010 2:27pm Subject: bzr commit into mysql-trunk-mtr branch (bjorn.munch:3452) List-Archive: http://lists.mysql.com/commits/127316 Message-Id: <201012201427.oBKERTrh028318@khepri15.norway.sun.com> MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit #At file:///home/bm136801/my/bug-tr/ based on revid:tor.didriksen@stripped 3452 Bjorn Munch 2010-12-20 [merge] merge test if fixes from trunk-mtr modified: .bzr-mysql/default.conf mysql-test/extra/rpl_tests/rpl_change_master.test mysql-test/extra/rpl_tests/rpl_crash_safe.inc mysql-test/include/check_ftwrl_compatible.inc mysql-test/include/check_ftwrl_incompatible.inc mysql-test/suite/innodb/t/innodb_bug42419.test mysql-test/suite/rpl/t/rpl_migration_crash_safe.test === modified file '.bzr-mysql/default.conf' --- a/.bzr-mysql/default.conf 2010-12-20 13:26:51 +0000 +++ b/.bzr-mysql/default.conf 2010-12-20 14:27:17 +0000 @@ -1,4 +1,4 @@ [MYSQL] post_commit_to = "commits@stripped" post_push_to = "commits@stripped" -tree_name = "mysql-trunk-bugfixing" +tree_name = "mysql-trunk-mtr" === modified file 'mysql-test/extra/rpl_tests/rpl_change_master.test' --- a/mysql-test/extra/rpl_tests/rpl_change_master.test 2010-12-19 17:25:42 +0000 +++ b/mysql-test/extra/rpl_tests/rpl_change_master.test 2010-12-20 14:27:17 +0000 @@ -236,7 +236,7 @@ CHANGE MASTER TO master_retry_count=-1; ## assert that the test has cleaned itself up -- let $retry_count6= query_get_value(SHOW SLAVE STATUS, Master_Retry_Count, 1) -if (`SELECT $retry_count6 <> $retry_count0`) +if ($retry_count6 != $retry_count0) { -- echo Unexpected retry count value! Got: $retry_count6, expected: $retry_count0 -- die === modified file 'mysql-test/extra/rpl_tests/rpl_crash_safe.inc' --- a/mysql-test/extra/rpl_tests/rpl_crash_safe.inc 2010-12-19 17:22:30 +0000 +++ b/mysql-test/extra/rpl_tests/rpl_crash_safe.inc 2010-12-20 14:27:17 +0000 @@ -104,7 +104,7 @@ if (`SELECT HEX(@commands) != HEX('')`) sync_slave_with_master; --let $slave_after= `SELECT master_log_pos FROM mysql.slave_relay_log_info` connection master; - if (`SELECT $slave_after != $master_after`) + if ($slave_after != $master_after) { --echo Slave is out of sync. --echo MASTER_BEFORE $master_before MASTER_AFTER $master_after SLAVE_BEFORE $slave_before SLAVE_AFTER $slave_after === modified file 'mysql-test/include/check_ftwrl_compatible.inc' --- a/mysql-test/include/check_ftwrl_compatible.inc 2010-11-11 17:11:05 +0000 +++ b/mysql-test/include/check_ftwrl_compatible.inc 2010-12-17 10:30:59 +0000 @@ -34,7 +34,7 @@ if (!$err) { --echo Success: Was able to run '$statement' under FTWRL. unlock tables; -if (`SELECT "$cleanup_stmt" <> ""`) +if ($cleanup_stmt) { --eval $cleanup_stmt; } @@ -91,12 +91,12 @@ connection default; --reap } -if (`SELECT "$cleanup_stmt" <> ""`) +if ($cleanup_stmt) { --eval $cleanup_stmt; } -if (`SELECT "$skip_3rd_check" = ""`) +if (!$skip_3rd_check) { # # Finally, let us check that FTWRL will succeed if this statement @@ -147,7 +147,7 @@ connection default; } set debug_sync= "RESET"; -if (`SELECT "$cleanup_stmt" <> ""`) +if ($cleanup_stmt) { --eval $cleanup_stmt; } === modified file 'mysql-test/include/check_ftwrl_incompatible.inc' --- a/mysql-test/include/check_ftwrl_incompatible.inc 2010-11-11 17:11:05 +0000 +++ b/mysql-test/include/check_ftwrl_incompatible.inc 2010-12-17 10:30:59 +0000 @@ -41,11 +41,11 @@ if (!$err) { --echo Error: Was able to run '$statement' under FTWRL! unlock tables; -if (`SELECT "$cleanup_stmt1" <> ""`) +if ($cleanup_stmt1) { --eval $cleanup_stmt1; } -if (`SELECT "$cleanup_stmt2" <> ""`) +if ($cleanup_stmt2) { --eval $cleanup_stmt2; } @@ -88,16 +88,16 @@ unlock tables; connection default; --reap -if (`SELECT "$cleanup_stmt1" <> ""`) +if ($cleanup_stmt1) { --eval $cleanup_stmt1; } -if (`SELECT "$cleanup_stmt2" <> ""`) +if ($cleanup_stmt2) { --eval $cleanup_stmt2; } -if (`SELECT "$skip_3rd_check" = ""`) +if (!$skip_3rd_check) { # # Finally, let us check that FTWRL will not succeed if this @@ -141,11 +141,11 @@ connection default; set debug_sync= "RESET"; -if (`SELECT "$cleanup_stmt1" <> ""`) +if ($cleanup_stmt1) { --eval $cleanup_stmt1; } -if (`SELECT "$cleanup_stmt2" <> ""`) +if ($cleanup_stmt2) { --eval $cleanup_stmt2; } === modified file 'mysql-test/suite/innodb/t/innodb_bug42419.test' --- a/mysql-test/suite/innodb/t/innodb_bug42419.test 2010-07-05 09:35:24 +0000 +++ b/mysql-test/suite/innodb/t/innodb_bug42419.test 2010-12-17 10:30:59 +0000 @@ -7,7 +7,7 @@ --source include/have_innodb.inc let $innodb_lock_wait_timeout= query_get_value(SHOW VARIABLES LIKE 'innodb_lock_wait_timeout%', Value, 1); -if (`SELECT $innodb_lock_wait_timeout < 10`) +if ($innodb_lock_wait_timeout < 10) { --echo # innodb_lock_wait_timeout must be >= 10 seconds --echo # so that this test can work all time fine on an overloaded testing box === modified file 'mysql-test/suite/rpl/t/rpl_migration_crash_safe.test' --- a/mysql-test/suite/rpl/t/rpl_migration_crash_safe.test 2010-12-19 17:22:30 +0000 +++ b/mysql-test/suite/rpl/t/rpl_migration_crash_safe.test 2010-12-20 14:27:17 +0000 @@ -47,7 +47,7 @@ let $MYSQLD_DATADIR= `SELECT @@datadir`; let $exp_slave= 0; let $got_slave= `SELECT COUNT(*) FROM mysql.slave_relay_log_info`; -if (`SELECT $got_slave <> $exp_slave`) +if ($got_slave != $exp_slave) { --echo "The mysql.slave_relay_log_info has information and this is not expected." --die @@ -72,7 +72,7 @@ INSERT INTO test VALUES (1), (2), (3); let $exp_slave= 1; let $got_slave= `SELECT COUNT(*) FROM mysql.slave_relay_log_info`; -if (`SELECT $got_slave <> $exp_slave`) +if ($got_slave != $exp_slave) { --echo "The mysql.slave_relay_log_info has information and this is not expected." --die @@ -90,7 +90,7 @@ file_exists $MYSQLD_DATADIR/relay-log.in let $exp_slave= 0; let $got_slave= `SELECT COUNT(*) FROM mysql.slave_relay_log_info`; -if (`SELECT $got_slave <> $exp_slave`) +if ($got_slave != $exp_slave) { --echo "The mysql.slave_relay_log_info has information and this is not expected." --die No bundle (reason: revision is a merge).