bzr commit into mysql-5.5-mtr branch (bjorn.munch:3130)

[Bjorn Munch]

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

 3130 Bjorn Munch	2010-12-17
      some more if stmt simplifications

    modified:
      mysql-test/extra/rpl_tests/rpl_stop_slave.test
      mysql-test/include/check_ftwrl_compatible.inc
      mysql-test/include/check_ftwrl_incompatible.inc
      mysql-test/include/show_slave_status.inc
      mysql-test/suite/innodb/t/innodb_bug42419.test
=== modified file 'mysql-test/extra/rpl_tests/rpl_stop_slave.test'
--- a/mysql-test/extra/rpl_tests/rpl_stop_slave.test	2010-10-16 12:03:44 +0000
+++ b/mysql-test/extra/rpl_tests/rpl_stop_slave.test	2010-12-17 10:30:59 +0000
@@ -9,7 +9,7 @@
 # --source extra/rpl_tests/rpl_stop_slave.test
 #
 
-if (`SELECT "$tmp_table_stm" = ''`)
+if (!$tmp_table_stm)
 {
   --echo \$tmp_table_stm is NULL
   --die $tmp_table_stm is NULL

=== 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/include/show_slave_status.inc'
--- a/mysql-test/include/show_slave_status.inc	2010-05-26 14:34:25 +0000
+++ b/mysql-test/include/show_slave_status.inc	2010-12-17 10:30:59 +0000
@@ -10,7 +10,7 @@ if (`SELECT "XX$status_items" = "XX"`)
 --disable_query_log
 --vertical_results
 
-while (`SELECT "XX$_items" <> "XX"`) 
+while ($_items) 
 {
   --let $_name= `SELECT SUBSTRING_INDEX('$_items', ',', 1)`
   --let $_items= `SELECT LTRIM(SUBSTRING('$_items', LENGTH('$_name') + 2))`

=== 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


Attachment: [text/bzr-bundle] bzr/[e-mail]