From: Bjorn Munch Date: October 21 2010 7:38am Subject: bzr commit into mysql-5.5-mtr branch (bjorn.munch:3103) List-Archive: http://lists.mysql.com/commits/121454 Message-Id: <201010210738.o9L7c06v018257@khepri15.norway.sun.com> MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit #At file:///home/bm136801/my/ifstr-55/ based on revid:bjorn.munch@stripped 3103 Bjorn Munch 2010-10-21 [merge] upmerge and adapt follow-up to 55582 modified: mysql-test/extra/binlog_tests/implicit.test mysql-test/extra/rpl_tests/create_recursive_construct.inc mysql-test/extra/rpl_tests/rpl_get_master_version_and_clock.test mysql-test/extra/rpl_tests/rpl_loaddata.test mysql-test/include/check_concurrent_insert.inc mysql-test/include/check_no_concurrent_insert.inc mysql-test/include/get_relay_log_pos.inc mysql-test/include/kill_query.inc mysql-test/include/kill_query_and_diff_master_slave.inc mysql-test/include/setup_fake_relay_log.inc mysql-test/include/show_events.inc mysql-test/include/show_rpl_debug_info.inc mysql-test/include/wait_for_slave_io_error.inc mysql-test/include/wait_for_slave_param.inc mysql-test/include/wait_for_slave_sql_error.inc mysql-test/include/wait_for_status_var.inc mysql-test/suite/binlog/t/binlog_unsafe.test mysql-test/suite/rpl/t/rpl_killed_ddl.test === modified file 'mysql-test/extra/binlog_tests/implicit.test' --- a/mysql-test/extra/binlog_tests/implicit.test 2009-09-23 11:20:48 +0000 +++ b/mysql-test/extra/binlog_tests/implicit.test 2010-10-21 07:37:10 +0000 @@ -6,7 +6,7 @@ INSERT INTO t1 VALUES (1); source include/show_binlog_events.inc; eval $statement; source include/show_binlog_events.inc; -if (`select '$cleanup' != ''`) { +if ($cleanup) { eval $cleanup; } @@ -22,7 +22,7 @@ INSERT INTO t1 VALUES (3); source include/show_binlog_events.inc; COMMIT; source include/show_binlog_events.inc; -if (`select '$cleanup' != ''`) { +if ($cleanup) { eval $cleanup; } === modified file 'mysql-test/extra/rpl_tests/create_recursive_construct.inc' --- a/mysql-test/extra/rpl_tests/create_recursive_construct.inc 2010-08-10 11:32:54 +0000 +++ b/mysql-test/extra/rpl_tests/create_recursive_construct.inc 2010-10-21 07:37:10 +0000 @@ -285,10 +285,10 @@ if (`SELECT $CRC_ARG_type = 7`) { } ######## execute! ######## -if (`SELECT '$CRC_RET_stmt_sidef' != ''`) { +if ($CRC_RET_stmt_sidef) { --echo --echo Invoking $CRC_RET_desc. - if (`SELECT '$CRC_create' != ''`) { + if ($CRC_create) { --eval $CRC_create } @@ -354,7 +354,7 @@ if (`SELECT '$CRC_RET_stmt_sidef' != ''` # Invoke created object, discarding the return value. This should not # give any warning. -if (`SELECT '$CRC_RET_sel_retval' != ''`) { +if ($CRC_RET_sel_retval) { --echo * Invoke statement so that return value is dicarded: expect no warning. --disable_result_log --eval $CRC_RET_sel_retval === modified file 'mysql-test/extra/rpl_tests/rpl_get_master_version_and_clock.test' --- a/mysql-test/extra/rpl_tests/rpl_get_master_version_and_clock.test 2010-05-28 02:57:45 +0000 +++ b/mysql-test/extra/rpl_tests/rpl_get_master_version_and_clock.test 2010-10-20 14:15:32 +0000 @@ -34,7 +34,7 @@ # connection slave; -if (`SELECT $debug_sync_action = ''`) +if (!$debug_sync_action) { --die Cannot continue. Please set value for debug_sync_action. } === modified file 'mysql-test/extra/rpl_tests/rpl_loaddata.test' --- a/mysql-test/extra/rpl_tests/rpl_loaddata.test 2010-08-03 03:49:14 +0000 +++ b/mysql-test/extra/rpl_tests/rpl_loaddata.test 2010-10-21 07:37:10 +0000 @@ -25,7 +25,7 @@ CALL mtr.add_suppression("Unsafe stateme # MTR is not case-sensitive. let $lower_stmt_head= load data; let $UPPER_STMT_HEAD= LOAD DATA; -if (`SELECT '$lock_option' <> ''`) +if ($lock_option) { #if $lock_option is null, an extra blank is added into the statement, #this will change the result of rpl_loaddata test case. so $lock_option === modified file 'mysql-test/include/check_concurrent_insert.inc' --- a/mysql-test/include/check_concurrent_insert.inc 2010-06-17 13:31:51 +0000 +++ b/mysql-test/include/check_concurrent_insert.inc 2010-10-21 07:37:10 +0000 @@ -23,7 +23,7 @@ # Reset DEBUG_SYNC facility for safety. set debug_sync= "RESET"; -if (`SELECT '$restore_table' <> ''`) +if ($restore_table) { --eval create temporary table t_backup select * from $restore_table; } @@ -82,7 +82,7 @@ connection default; --eval delete from $table where i = 0; -if (`SELECT '$restore_table' <> ''`) +if ($restore_table) { --eval truncate table $restore_table; --eval insert into $restore_table select * from t_backup; === modified file 'mysql-test/include/check_no_concurrent_insert.inc' --- a/mysql-test/include/check_no_concurrent_insert.inc 2010-08-06 11:29:37 +0000 +++ b/mysql-test/include/check_no_concurrent_insert.inc 2010-10-21 07:37:10 +0000 @@ -23,7 +23,7 @@ # Reset DEBUG_SYNC facility for safety. set debug_sync= "RESET"; -if (`SELECT '$restore_table' <> ''`) +if ($restore_table) { --eval create temporary table t_backup select * from $restore_table; } @@ -68,7 +68,7 @@ if (!$success) --eval delete from $table where i = 0; -if (`SELECT '$restore_table' <> ''`) +if ($restore_table) { --eval truncate table $restore_table; --eval insert into $restore_table select * from t_backup; === modified file 'mysql-test/include/get_relay_log_pos.inc' --- a/mysql-test/include/get_relay_log_pos.inc 2010-05-26 14:34:25 +0000 +++ b/mysql-test/include/get_relay_log_pos.inc 2010-10-21 07:37:10 +0000 @@ -10,12 +10,12 @@ # # at this point, get_relay_log_pos.inc sets $relay_log_pos. echo position # # in $relay_log_file: $relay_log_pos. -if (`SELECT '$relay_log_file' = ''`) +if (!$relay_log_file) { --die 'variable $relay_log_file is null' } -if (`SELECT '$master_log_pos' = ''`) +if (!$master_log_pos) { --die 'variable $master_log_pos is null' } === modified file 'mysql-test/include/kill_query.inc' --- a/mysql-test/include/kill_query.inc 2009-12-10 03:44:19 +0000 +++ b/mysql-test/include/kill_query.inc 2010-10-20 14:15:32 +0000 @@ -44,7 +44,7 @@ connection master; # kill the query that is waiting eval kill query $connection_id; -if (`SELECT '$debug_lock' != ''`) +if ($debug_lock) { # release the lock to allow binlog continue eval SELECT RELEASE_LOCK($debug_lock); @@ -57,7 +57,7 @@ reap; connection master; -if (`SELECT '$debug_lock' != ''`) +if ($debug_lock) { # get lock again to make the next query wait eval SELECT GET_LOCK($debug_lock, 10); === modified file 'mysql-test/include/kill_query_and_diff_master_slave.inc' --- a/mysql-test/include/kill_query_and_diff_master_slave.inc 2009-03-27 05:19:50 +0000 +++ b/mysql-test/include/kill_query_and_diff_master_slave.inc 2010-10-20 14:15:32 +0000 @@ -25,7 +25,7 @@ source include/kill_query.inc; connection master; disable_query_log; disable_result_log; -if (`SELECT '$debug_lock' != ''`) +if ($debug_lock) { eval SELECT RELEASE_LOCK($debug_lock); } @@ -36,8 +36,8 @@ source include/diff_master_slave.inc; # Acquire the debug lock again if used connection master; -disable_query_log; disable_result_log; if (`SELECT '$debug_lock' != -''`) { eval SELECT GET_LOCK($debug_lock, 10); } enable_result_log; -enable_query_log; +disable_query_log; disable_result_log; +if ($debug_lock) { eval SELECT GET_LOCK($debug_lock, 10); } +enable_result_log; enable_query_log; connection $connection_name; === modified file 'mysql-test/include/setup_fake_relay_log.inc' --- a/mysql-test/include/setup_fake_relay_log.inc 2010-09-20 08:08:32 +0000 +++ b/mysql-test/include/setup_fake_relay_log.inc 2010-10-21 07:37:10 +0000 @@ -56,7 +56,7 @@ if (`SELECT "$_sql_running" = "Yes" OR " # Read server variables. let $MYSQLD_DATADIR= `SELECT @@datadir`; let $_fake_filename= query_get_value(SHOW VARIABLES LIKE 'relay_log', Value, 1); -if (`SELECT '$_fake_filename' = ''`) { +if (!$_fake_filename) { --echo Badly written test case: relay_log variable is empty. Please use the --echo server option --relay-log=FILE. } === modified file 'mysql-test/include/show_events.inc' --- a/mysql-test/include/show_events.inc 2010-05-26 14:34:25 +0000 +++ b/mysql-test/include/show_events.inc 2010-10-21 07:37:10 +0000 @@ -18,14 +18,14 @@ if ($is_relay_log) --let $_statement=show relaylog events } -if (`SELECT '$binlog_file' <> ''`) +if ($binlog_file) { --let $_statement= $_statement in '$binlog_file' } --let $_statement= $_statement from $binlog_start -if (`SELECT '$binlog_limit' <> ''`) +if ($binlog_limit) { --let $_statement= $_statement limit $binlog_limit } === modified file 'mysql-test/include/show_rpl_debug_info.inc' --- a/mysql-test/include/show_rpl_debug_info.inc 2010-05-24 13:54:08 +0000 +++ b/mysql-test/include/show_rpl_debug_info.inc 2010-10-20 14:15:32 +0000 @@ -48,13 +48,13 @@ let $binlog_name= query_get_value("SHOW eval SHOW BINLOG EVENTS IN '$binlog_name'; let $_master_con= $master_connection; -if (`SELECT '$_master_con' = ''`) +if (!$_master_con) { if (`SELECT '$_con' = 'slave'`) { let $_master_con= master; } - if (`SELECT '$_master_con' = ''`) + if (!$_master_con) { --echo Unable to determine master connection. No debug info printed for master. --echo Please fix the test case by setting $master_connection before sourcing @@ -62,7 +62,7 @@ if (`SELECT '$_master_con' = ''`) } } -if (`SELECT '$_master_con' != ''`) +if ($_master_con) { let $master_binlog_name_io= query_get_value("SHOW SLAVE STATUS", Master_Log_File, 1); === modified file 'mysql-test/include/wait_for_slave_io_error.inc' --- a/mysql-test/include/wait_for_slave_io_error.inc 2010-05-28 03:21:20 +0000 +++ b/mysql-test/include/wait_for_slave_io_error.inc 2010-10-21 07:37:10 +0000 @@ -31,7 +31,7 @@ # $master_connection # See wait_for_slave_param.inc for description. -if (`SELECT '$slave_io_errno' = ''`) { +if (!$slave_io_errno) { --die !!!ERROR IN TEST: you must set \$slave_io_errno before sourcing wait_for_slave_io_error.inc } === modified file 'mysql-test/include/wait_for_slave_param.inc' --- a/mysql-test/include/wait_for_slave_param.inc 2010-05-26 14:34:25 +0000 +++ b/mysql-test/include/wait_for_slave_param.inc 2010-10-21 07:37:10 +0000 @@ -53,7 +53,7 @@ if (!$_slave_timeout_counter) let $slave_tcnt= $_slave_timeout_counter; let $_slave_param_comparison= $slave_param_comparison; -if (`SELECT '$_slave_param_comparison' = ''`) +if (!$_slave_param_comparison) { let $_slave_param_comparison= =; } @@ -73,7 +73,7 @@ while (`SELECT NOT('$_show_slave_status_ if (!$_slave_timeout_counter) { --echo **** ERROR: timeout after $slave_tcnt deci-seconds while waiting for slave parameter $slave_param $_slave_param_comparison $slave_param_value **** - if (`SELECT '$slave_error_message' != ''`) + if ($slave_error_message) { --echo Message: $slave_error_message } === modified file 'mysql-test/include/wait_for_slave_sql_error.inc' --- a/mysql-test/include/wait_for_slave_sql_error.inc 2010-05-24 13:54:08 +0000 +++ b/mysql-test/include/wait_for_slave_sql_error.inc 2010-10-20 14:15:32 +0000 @@ -24,7 +24,7 @@ # $master_connection # See wait_for_slave_param.inc for description. -if (`SELECT '$slave_sql_errno' = ''`) { +if (!$slave_sql_errno) { --die !!!ERROR IN TEST: you must set \$slave_sql_errno before sourcing wait_for_slave_sql_error.inc } === modified file 'mysql-test/include/wait_for_status_var.inc' --- a/mysql-test/include/wait_for_status_var.inc 2010-05-24 13:54:08 +0000 +++ b/mysql-test/include/wait_for_status_var.inc 2010-10-20 14:15:32 +0000 @@ -45,7 +45,7 @@ if (!$_status_timeout_counter) } let $_status_var_comparsion= $status_var_comparsion; -if (`SELECT '$_status_var_comparsion' = ''`) +if (!$_status_var_comparsion) { let $_status_var_comparsion= =; } === modified file 'mysql-test/suite/binlog/t/binlog_unsafe.test' --- a/mysql-test/suite/binlog/t/binlog_unsafe.test 2010-08-10 11:32:54 +0000 +++ b/mysql-test/suite/binlog/t/binlog_unsafe.test 2010-10-21 07:37:10 +0000 @@ -321,7 +321,7 @@ while (`SELECT $unsafe_type < 9`) { --source extra/rpl_tests/create_recursive_construct.inc # Drop created object. - if (`SELECT '$drop_3' != ''`) { + if ($drop_3) { --eval $drop_3 } --inc $call_type_3 @@ -330,7 +330,7 @@ while (`SELECT $unsafe_type < 9`) { } # if (!is_toplevel_2) # Drop created object. - if (`SELECT '$drop_2' != ''`) { + if ($drop_2) { --eval $drop_2 } --inc $call_type_2 @@ -338,7 +338,7 @@ while (`SELECT $unsafe_type < 9`) { } # if (!is_toplevel_1) # Drop created object. - if (`SELECT '$drop_1' != ''`) { + if ($drop_1) { --eval $drop_1 } --inc $call_type_1 === modified file 'mysql-test/suite/rpl/t/rpl_killed_ddl.test' --- a/mysql-test/suite/rpl/t/rpl_killed_ddl.test 2010-02-06 10:28:06 +0000 +++ b/mysql-test/suite/rpl/t/rpl_killed_ddl.test 2010-10-21 07:37:10 +0000 @@ -119,7 +119,7 @@ echo [on master]; # This will block the execution of a statement at the DBUG_SYNC_POINT # with given lock name -if (`SELECT '$debug_lock' != ''`) +if ($debug_lock) { disable_query_log; disable_result_log; No bundle (reason: revision is a merge).