From c406c797976ff856a9729d2f7d05ae0f2547fedc Mon Sep 17 00:00:00 2001
From: Bjorn Munch <bjorn.munch@oracle.com>
Date: Fri, 17 Dec 2010 11:30:59 +0100
Subject: some more if stmt simplifications

---
 mysql-test/include/check_ftwrl_compatible.inc   |  8 ++++----
 mysql-test/include/check_ftwrl_incompatible.inc | 14 +++++++-------
 mysql-test/include/show_slave_status.inc        |  2 +-
 3 files changed, 12 insertions(+), 12 deletions(-)

(limited to 'mysql-test/include')

diff --git a/mysql-test/include/check_ftwrl_compatible.inc b/mysql-test/include/check_ftwrl_compatible.inc
index 76c1915957c..200f8cd3d8a 100644
--- a/mysql-test/include/check_ftwrl_compatible.inc
+++ b/mysql-test/include/check_ftwrl_compatible.inc
@@ -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;
 }
diff --git a/mysql-test/include/check_ftwrl_incompatible.inc b/mysql-test/include/check_ftwrl_incompatible.inc
index 56deef8e92f..4787a69ea9c 100644
--- a/mysql-test/include/check_ftwrl_incompatible.inc
+++ b/mysql-test/include/check_ftwrl_incompatible.inc
@@ -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;
 }
diff --git a/mysql-test/include/show_slave_status.inc b/mysql-test/include/show_slave_status.inc
index d66c068e19b..5cc04993487 100644
--- a/mysql-test/include/show_slave_status.inc
+++ b/mysql-test/include/show_slave_status.inc
@@ -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))`
-- 
cgit v1.2.1