From: Bjorn Munch
Date: October 21 2010 1:21pm
Subject: bzr commit into mysql-5.1-mtr branch (bjorn.munch:2947) Bug#55582
List-Archive: http://lists.mysql.com/commits/121535
X-Bug: 55582
Message-Id: <201010211321.o9LDLDm5015083@khepri15.norway.sun.com>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============0385814188=="

--===============0385814188==
MIME-Version: 1.0
Content-Type: text/plain; charset="us-ascii"
Content-Transfer-Encoding: 7bit
Content-Disposition: inline

#At file:///home/bm136801/my/ifstr-51/ based on revid:bjorn.munch@stripped

 2947 Bjorn Munch	2010-10-21
      Follow-up to Bug #55582 which allows checking strings in if
        Simplified cases where a select was used to compare variable against ''

    modified:
      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_binlog_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/rpl/t/rpl_killed_ddl.test
=== 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-21 13:20:50 +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-02-04 11:26:36 +0000
+++ b/mysql-test/extra/rpl_tests/rpl_loaddata.test	2010-10-21 13:20:50 +0000
@@ -24,7 +24,7 @@ connection master;
 # 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-05-27 20:07:40 +0000
+++ b/mysql-test/include/check_concurrent_insert.inc	2010-10-21 13:20:50 +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-05-27 20:07:40 +0000
+++ b/mysql-test/include/check_no_concurrent_insert.inc	2010-10-21 13:20:50 +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;
 }
@@ -67,7 +67,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-24 13:54:08 +0000
+++ b/mysql-test/include/get_relay_log_pos.inc	2010-10-21 13:20:50 +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-21 13:20:50 +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-21 13:20:50 +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-15 12:56:22 +0000
+++ b/mysql-test/include/setup_fake_relay_log.inc	2010-10-21 13:20:50 +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_binlog_events.inc'
--- a/mysql-test/include/show_binlog_events.inc	2010-05-24 13:54:08 +0000
+++ b/mysql-test/include/show_binlog_events.inc	2010-10-21 13:20:50 +0000
@@ -27,14 +27,14 @@ if (!$binlog_start)
 }
 
 --let $_statement=show binlog 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-21 13:20:50 +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 02:57:45 +0000
+++ b/mysql-test/include/wait_for_slave_io_error.inc	2010-10-21 13:20:50 +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-24 13:54:08 +0000
+++ b/mysql-test/include/wait_for_slave_param.inc	2010-10-21 13:20:50 +0000
@@ -51,7 +51,7 @@ if (!$_slave_timeout_counter)
 }
 
 let $_slave_param_comparison= $slave_param_comparison;
-if (`SELECT '$_slave_param_comparison' = ''`)
+if (!$_slave_param_comparison)
 {
   let $_slave_param_comparison= =;
 }
@@ -71,7 +71,7 @@ while (`SELECT NOT('$_show_slave_status_
 if (!$_slave_timeout_counter)
 {
   --echo **** ERROR: timeout after $slave_timeout 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-21 13:20:50 +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-21 13:20:50 +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/rpl/t/rpl_killed_ddl.test'
--- a/mysql-test/suite/rpl/t/rpl_killed_ddl.test	2009-12-21 06:14:45 +0000
+++ b/mysql-test/suite/rpl/t/rpl_killed_ddl.test	2010-10-21 13:20:50 +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;


--===============0385814188==
MIME-Version: 1.0
Content-Type: text/bzr-bundle; charset="us-ascii";
	name="bzr/bjorn.munch@stripped"
Content-Transfer-Encoding: 7bit
Content-Disposition: inline

# Bazaar merge directive format 2 (Bazaar 0.90)
# revision_id: bjorn.munch@stripped
# target_branch: file:///home/bm136801/my/ifstr-51/
# testament_sha1: f600e5aedae8073019c9c9d0fa187b5a98ba53b0
# timestamp: 2010-10-21 15:21:13 +0200
# base_revision_id: bjorn.munch@stripped\
#   go8hn2zk2s7u5d29
# 
# Begin bundle
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
/F3JFOFCQ/pjfTA=


--===============0385814188==--