From: Bjorn Munch Date: October 20 2010 2:16pm Subject: bzr commit into mysql-5.1-mtr branch (bjorn.munch:2943) Bug#55582 List-Archive: http://lists.mysql.com/commits/121341 X-Bug: 55582 Message-Id: <201010201416.o9KEGjH6016447@khepri15.norway.sun.com> MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="===============0538006587==" --===============0538006587== 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 2943 Bjorn Munch 2010-10-20 Follow-up to Bug #55582 which allows chaecking 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-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-02-04 11:26:36 +0000 +++ b/mysql-test/extra/rpl_tests/rpl_loaddata.test 2010-10-20 14:15:32 +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-20 14:15:32 +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-20 14:15:32 +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-20 14:15:32 +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-15 12:56:22 +0000 +++ b/mysql-test/include/setup_fake_relay_log.inc 2010-10-20 14:15:32 +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-20 14:15:32 +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-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 02:57:45 +0000 +++ b/mysql-test/include/wait_for_slave_io_error.inc 2010-10-20 14:15:32 +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-20 14:15:32 +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-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/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-20 14:15:32 +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; --===============0538006587== 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: 86495b1f3dd2161bdafef3dc112efceaa0b9d224 # timestamp: 2010-10-20 16:16:45 +0200 # base_revision_id: bjorn.munch@stripped\ # fa2az6bab2toa0z3 # # Begin bundle IyBCYXphYXIgcmV2aXNpb24gYnVuZGxlIHY0CiMKQlpoOTFBWSZTWf3g+CgACaXfgAAQfOf//1uO jAC////6YA/c721zt3zi5bahIoooCgpHp3AFKqqJAJTbFtZioAYoqfpqmA0jIwxQ09TNIwjADSZN qY5piYCNMCMIwAAABMIwGqn+o0aNUnqHoQ0wmhkMTTExMBAASIRCAT0yQmJGmmTE2po0DTQaGgRS IGhDSME1NlPR6ianhTQMgANAKpI0BMEAJiGgTKYmqb1QABo03mhnr056VetNbd2aPm02eSYRLIGx sbF8MD5Pcz3P5OWOxx40isYFEQprdblVrPk4jjffXvzSQA1n+vBugEs5xqCq6igw5UVICNWifJOU mR6M5nugWLKWV0kAbYS2rC6D5f3kA28VfkrgrEEMBA2m22wYxtsbEH8fASzGhGNsOPm30Zs5jWMW YTkklkj1kKlILwQpEyK5hFwUhQ+bJFYpl3k72i0xTwZd4YRDWLwvFneXBUxdkTEUxigTE5d67k9M W67qh47w6To+8PaAkz0U5RSpXyT/Ikmf0YCT0ggqSMjlAh+gReiija++1ro3ROIYjMyZohbLUZgx /Z/UN8LK/mrnpihVpn8J6Ja9OP4IOEKAeHtWrGA2xoZ9spB8Wl5+/vZ9UxHXMA3Kz3ByVjTfjStl vx8VgqKYr1CGIl4xiQoGAaB9C8FEUHytUxtblqkI9WKLJLBrb0kCqh5+MFbQjxY5zeURH8Wmi/e5 MHOhy0oMOWtzbmqzWh9yDYqHFyC3TOmNkb7S0tLlQncB7vTCCDkrZbgrirllwy2IT23qucIHGBCI 4QzhJQBXXvvlcVNdRUenz7CY4kCQoxedCeyFRqVLVNMZqWCrGmogpdkouTUIF+GF6dS9oxNhRAxb S5ngQVt6hkhJBixcS/AubBqxBjAjAuQYF1YxKBkigo9JcVijcZGVjOapQkFyaVSxqTgTjUmsSaaU moyVKcDIka2ZI0GsypkSLNPOvyPfg/Qw+aG8WhORBshJGpyIZVHVgg4Z2LmGrtTQGI0INWkhtwKj a/12q06hf1cvXFiYIya2zXjQwUQqv1aFHabjJf6Zz1FQPYtumw4G1b4MuPdjyt3Z1rsp55HJWuUq FGpVmpRrSSKNSuKRQzgXoFLCKl8363eatu44oEtzByZGpJQtYTSXSW47H2mwVe3tXO6Nu3HVTKUZ xEVr+eGbRzWJ74iL1abE4ObJW6Z3C1YqWPG95ME3N7PJ1ToxlxUS4X7iZ8DDbhiOtxBQgJeFgNRp A2khZLQQG08SMTsgssR4tMLMeRJ5cqJlmNj5nYYGXRookrUZo+bqHugTjuy65a2FaLbGLWslZXDH eWsbVTBNuVXxitsweCor2PO8TQZKGkNShNkweFhgk5oH2Rc5Pbda5t7N47I2ejJW8DoC1N3XEadM XqR33tYwJILGw0gV6OR2EFI39Wq9AqqSSj3wbU482U4stW0JuzQmtRc1u6lf2vUqFPGRa0XNupaS TUtUb1LFU3rU9Git/ZSlbok4PhHk+ni7Oqpi1uTU3aT3S4J63o7IeFtCL36SdYXWwmAMBnf6LnBm 4UGRdBiqvToctSMFiBasxUrC29fTCVCa2WK2SlozYrXJLVclUtZVRVkp+JuLMsYGKS6M4S5hm6sl Clapoa1ChYuZuV2x1bHg6u5GJyO4OBgIDzi0joM7dYv1OZmmaLswtJabEnlZq8nBY4sWjChRJRLm aetnOiSpG9bQWDowXruW9agb7lLJYsbkUsWBq3NUmp/pSrk3xsbvnY0zTWslSammdrjwdm21o0Zq 1jauyYslap1bU1da1k1TVLWCz5Ird1aK2ctdFtF0mkmFEtl867eKlctZOiowVrlyrnapsh374ODa 12KMFqbFTYpXsiej0a1jRK5XW5V7EiSV7GKXJPFf15QM2LZqb4qbUmF7WxhJa+zbHq8xsoyMs6z1 hhzIqG41LHAv0O0rneiwRRIyatWreEq0XOG51dOmCxxaGTWqXuKxtrjbFtEqkmrVsZrXhpA1tqhk 0rbmjg6vA+HT7fw48eUYcWydVEqM9mynE0RQkseXgobltStbdPwWOS/G9mzr8l7Usxaly50mmt8l OK5avX4sLF6WdLm0Zlq9tYZXeFK+NqhtXUOibam0UslVjBakkowNsRQTntqIiI5lc9nMNO+d5RoN CkyMhvUL4qi6xQk2MVCtc2K2tSypvymwVrGShpfKpW1rqnk9d7iwXL1uShujFimsfbzSpZxKON4S 69kKUbbzsGrw3bAC+6wBeEA5dgCwgvg7L6A9/T9ACl7OpEMBg22epJdZLchEDG2NtjbBDTff8Ul2 e08UkFl6eAEG5ApBAhIhfslihruv/Q9/V+pr1Tc7APITzXMhlN3z1geo9o3S9aaZI2Pp2Lef396k qgVlvlBKSYmCpMICkxBMJi3hTb2tYrlSrcGIYBiMkrYPd25M/UrFaLhDUEMp0pWEFAsd9ji+G7ZG 1ezgVpREVPh6drE9ayO6l6v5fD9TWRLBWuUsH0+6S9N+n3cFSqbD8qY/fE8/BLFkvYu+MRB85vCP DN++bk48FTtsYIPLuRcdeDjbYcQnRsLnW03Ig20UZJY7/J7Ic4liVHdEZJRFDFV0j+n7aOeCSTs7 2LVKuJHi8X7bno8ez29prGDMsTUqqY9qtGCh+0nNJW2Lklj/AeUfZ8EYn7awlERR/XjBr+p7kOz9 QhHwiPVvbF7ZJx3JPpzsceSWnZNqdHViod0WsG1WuSkza5zT7MVmTNm+ZNJJsGPTWz+pCErunVKD 1ECnotmwZRNUOHS8H5ojzxqU9hbrvefwuR+aolt4REYpPd6d6uDwVLurJc9PhV5qzm2JpuepsgZO 7u2QKG1Nkr7r2jaqYsYiIsoYehpC47nqMzEsKi4xNr058nvBrLCb8F0XQWJx+A49/83xlHkgZPNM jjOPfAqfn8hKULJeuowBmqHxhXfxIO66w4FRgDM6bzlqjnTPtsljOG/J6tS93dmtgsTqYKWtYocF qmKn3iI4xD5uZjAecCS7PLirINghASJsFkw0B4lNxQ8EL2dSM7+O/pZw4N6yKV7XJP09++dWuVfb zx7Sr/rQ3Lr9Dx1dT4WCnEYQOxxI7TwOvpzQr0+8GxL2l8e46KcfL0NSISpKEmSKo0c27GK0Fr3X RERNWnfBHf5wdh1cG5VXmXtr0e71eyTB9Pf38Wau5k+zUvVPsoa4xYtI2OBk00m1Lg3A5G4E+tW8 zV7VZdoPAMhAxCoGs0Zj5j0xyK/U7jpgd+nzIYgDiTBvKgqAhJsQiRLw7PNtRPURU3Ikg1N0fno8 02vL7/TFt9o5yEMwd1Gigj8xymj+I5/Lsmgamto+WKOh5ogxUtBazdn8vxtfiWNfWIiJeP2v9s0p EJfeIMufBzWhHvBcr/xubwyIrQYURRtj8DZKEz2/4+td30rM3gQ8nvx4pkfygz/GZFdFNBrVxEcP y/ncRa7o7MWL8v6WREHi+Ba+WPdwavp7LRuQMXAv5MPx+ZSk6Qhd0s6+DRkga2P5bI+SlQgfdag3 1H8xYSgpRKJoipeHqAQRBkqEhWQTsZ0N42ZgU69GWdEN9VLEKfdJfZiCA0GRrLSFZ2g6fEHobwet iyIRK9xcGdVWcaSNUcOSoL1WW3gl+CJetpjSG0Ar4e4qB9FQ6dZ2n0PFWnXFywR1AzVCUDuJIG99 lbBfC3XCoTBsGBCYe04HoPWXAKAe03Qi8nanRxBWRYSPcNQxDNRFaSmNjn93FIPFs4JVROIiSBc0 cljgFHvfCALaSQKB5jkZ/74oLUDgyvgkoQM5gXm6GgPJUNApJ+oBM5sBx2mUDGh256FTZcUOB4cr nu6gvzmrCBIQ1bT2Nqs/NlcUL7uywi/cej96/Xc4qWnBHdKIjzfTik5gdp7+GwmDk3Jq9SoCmwTV iECUh5Llp7ysKPnDVuIVgIEJhM4evIA3A9B3l2N2qeVAt6QjAXsOBGZgY5eF1C8fFNmhK8wLgLgn yk1SM/36MXn7sFayJSiO1t1M+DYURL398nksq0K3dwVWPJURX18cWXPm/lxIrI3yPCIihVXJqcUC I0g2K6jWge0+6CIWI0nxugC9XCIiIiPiWBCt5rhUmFwGoQmHTrkVwegNflV07Kd0nLMkGi3cbORS ssLgZKyBgPA1D5Cs64vK1MPRVbzmOURfERa3IiKOGnBj32cHbfa7vGWJg6hTY7zmT2kVQQ6IQNu9 1hMg0lpBxLny9WZY9HtcRnyIxXme4frxI+kNt927UfCBkjrNqdVBH9sIiDa+3eKvyq8ETO3qgUPB ycUvQr6IjxicTiRDqy8uLb+tlj7vjUodViPr6YJSSok06K29tb3o2prHByb1t7L1XoHRUrWNWxNK ObagVt8BreZHjotf3PQ1ZJQ9UoxiSRU8FC901wOnNL7GtitfaMEl1Jybm4op587g+Y5JvBFxGObp D/8XckU4UJD94Pgo --===============0538006587==--