List:Commits« Previous MessageNext Message »
From:Bjorn Munch Date:November 17 2010 12:21pm
Subject:bzr commit into mysql-trunk-mtr branch (bjorn.munch:2987)
View as plain text  
#At file:///home/bm136801/my/mtr-tr/ based on revid:bjorn.munch@stripped

 2987 Bjorn Munch	2010-11-17
      Tests: more simplifications of if/while after 57276

    modified:
      mysql-test/extra/rpl_tests/rpl_row_empty_imgs.test
      mysql-test/extra/rpl_tests/rpl_row_img.test
      mysql-test/extra/rpl_tests/rpl_row_img_blobs.test
      mysql-test/extra/rpl_tests/rpl_row_img_diff_indexes.test
      mysql-test/extra/rpl_tests/rpl_stop_slave.test
      mysql-test/include/rpl_assert.inc
      mysql-test/include/rpl_chained_3_hosts.inc
      mysql-test/include/rpl_row_img_set.inc
      mysql-test/include/show_slave_status.inc
      mysql-test/include/wait_for_binlog_event.inc
      mysql-test/suite/perfschema/t/setup_actors.test
      mysql-test/suite/rpl/t/rpl_change_master.test
      mysql-test/suite/rpl/t/rpl_delayed_slave.test
      mysql-test/suite/rpl/t/rpl_packet.test
      mysql-test/suite/rpl/t/rpl_read_old_relay_log_info.test
      mysql-test/suite/rpl/t/rpl_seconds_behind_master.test
      mysql-test/suite/rpl/t/rpl_server_uuid.test
      mysql-test/t/server_uuid.test
=== modified file 'mysql-test/extra/rpl_tests/rpl_row_empty_imgs.test'
--- a/mysql-test/extra/rpl_tests/rpl_row_empty_imgs.test	2010-05-10 23:33:42 +0000
+++ b/mysql-test/extra/rpl_tests/rpl_row_empty_imgs.test	2010-11-17 12:21:45 +0000
@@ -278,7 +278,7 @@ SELECT * FROM t1;
 -- connection mysqld_b
 
 -- let $lower_engine= `SELECT LOWER('$engine')`
-if (`SELECT '$lower_engine' = 'ndb'`)
+if ($lower_engine == ndb)
 {
   if ($verbose)
   {
@@ -298,7 +298,7 @@ SET SQL_LOG_BIN=1;
 #       wait forever.
 -- source include/wait_for_slave_sql_to_stop.inc
 -- let $errno=query_get_value("show slave status", Last_SQL_Errno, 1)
-if (`SELECT $errno <> 1032`)
+if ($errno != 1032)
 {
   -- echo ### UNEXPECTED ERROR AT THE SLAVE: $errno
   SHOW SLAVE STATUS;

=== modified file 'mysql-test/extra/rpl_tests/rpl_row_img.test'
--- a/mysql-test/extra/rpl_tests/rpl_row_img.test	2010-03-30 16:06:36 +0000
+++ b/mysql-test/extra/rpl_tests/rpl_row_img.test	2010-11-17 12:21:45 +0000
@@ -48,7 +48,7 @@ while($i)
   -- connection mysqld_c
   SET SQL_LOG_BIN=0;
 
-  if (`SELECT $i=1`) {
+  if ($i == 1) {
     let $step= No keys;
     --echo ******* TEST: $step
     -- connection mysqld_a
@@ -59,7 +59,7 @@ while($i)
     --eval CREATE TABLE t (c1 int, c2 char(1), c3 char(1), c4 char(1)) engine= $mysqld_c_engine;
 
   }
-  if (`SELECT $i=2`)
+  if ($i == 2)
   { 
     let $step= One key;
     --echo ******* TEST: $step
@@ -71,7 +71,7 @@ while($i)
     --eval CREATE TABLE t (c1 int, c2 char(1), c3 char(1), c4 char(1), key(c1)) engine= $mysqld_c_engine;
 
   }
-  if (`SELECT $i=3`)
+  if ($i == 3)
   {
     let $step= One Composite key;
     --echo ****** TEST: $step
@@ -82,7 +82,7 @@ while($i)
     -- connection mysqld_c
     --eval CREATE TABLE t (c1 int, c2 char(1), c3 char(1), c4 char(1), key(c1,c2)) engine= $mysqld_c_engine;
   }  
-  if (`SELECT $i=4`)
+  if ($i == 4)
   {
     let $step= One Unique key;
     --echo ****** TEST: $step
@@ -94,7 +94,7 @@ while($i)
     --eval CREATE TABLE t (c1 int, c2 char(1), c3 char(1), c4 char(1), unique key(c1)) engine= $mysqld_c_engine;
 
   }  
-  if (`SELECT $i=5`)
+  if ($i == 5)
   {
     let $step= One Composite Unique key;
     --echo ****** TEST: $step
@@ -106,7 +106,7 @@ while($i)
     --eval CREATE TABLE t (c1 int, c2 char(1), c3 char(1), c4 char(1), unique key(c1,c2)) engine= $mysqld_c_engine;
 
   }  
-  if (`SELECT $i=6`)
+  if ($i == 6)
   {
     let $step= One Primary key;
     --echo ****** TEST: $step
@@ -117,7 +117,7 @@ while($i)
     -- connection mysqld_c
     --eval CREATE TABLE t (c1 int, c2 char(1), c3 char(1), c4 char(1), primary key(c1)) engine= $mysqld_c_engine;
   }  
-  if (`SELECT $i=7`)
+  if ($i == 7)
   {
     let $step= One Composite Primary Key;
     --echo ****** TEST: $step
@@ -128,7 +128,7 @@ while($i)
     -- connection mysqld_c
     --eval CREATE TABLE t (c1 int, c2 char(1), c3 char(1), c4 char(1), primary key(c1,c2)) engine= $mysqld_c_engine;
   } 
-  if (`SELECT $i=8`)
+  if ($i == 8)
   {
     let $step= One Composite key with holes;
     --echo ****** TEST: $step
@@ -139,7 +139,7 @@ while($i)
     -- connection mysqld_c
     --eval CREATE TABLE t (c1 int, c2 char(1), c3 char(1), c4 char(1), key(c1,c3)) engine= $mysqld_c_engine;
   }  
-  if (`SELECT $i=9`)
+  if ($i == 9)
   {
     let $step= One Composite Unique key with holes;
     --echo ****** TEST: $step
@@ -150,7 +150,7 @@ while($i)
     -- connection mysqld_c
     --eval CREATE TABLE t (c1 int, c2 char(1), c3 char(1), c4 char(1), unique key(c1,c3)) engine= $mysqld_c_engine;
   }  
-  if (`SELECT $i=10`)
+  if ($i == 10)
   {
     let $step= One Composite Primary Key with holes;
     --echo ****** TEST: $step
@@ -161,7 +161,7 @@ while($i)
     -- connection mysqld_c
     --eval CREATE TABLE t (c1 int, c2 char(1), c3 char(1), c4 char(1), primary key(c1,c3)) engine= $mysqld_c_engine;
   } 
-  if (`SELECT $i=11`)
+  if ($i == 11)
   {
     let $step= One Composite NOT NULL Unique key with holes;
     --echo ****** TEST: $step
@@ -172,7 +172,7 @@ while($i)
     -- connection mysqld_c
     --eval CREATE TABLE t (c1 int NOT NULL, c2 char(1), c3 char(1) NOT NULL, c4 char(1), unique key(c1,c3)) engine= $mysqld_c_engine;
   }  
-  if (`SELECT $i=12`)
+  if ($i == 12)
   {
     let $step= One Composite NOT NULL Unique key with holes in master, but NULLABLE on first slave;
     --echo ****** TEST: $step

=== modified file 'mysql-test/extra/rpl_tests/rpl_row_img_blobs.test'
--- a/mysql-test/extra/rpl_tests/rpl_row_img_blobs.test	2010-03-30 16:06:36 +0000
+++ b/mysql-test/extra/rpl_tests/rpl_row_img_blobs.test	2010-11-17 12:21:45 +0000
@@ -57,7 +57,7 @@ while($i)
   # binlog_row_image configured as NOBLOB.
   #
 
-  if (`SELECT $i=1`) {
+  if ($i == 1) {
     -- echo ### Asserts that declaring a blob as part of a primary key does not break replication
     -- connection mysqld_a
     --eval CREATE TABLE t (c1 int, c2 blob, c3 int, primary key(c2(512))) engine= $mysqld_a_engine;
@@ -66,7 +66,7 @@ while($i)
     -- connection mysqld_c 
     --eval CREATE TABLE t (c1 int, c2 blob, c3 int, primary key(c2(512))) engine= $mysqld_c_engine;
   }
-  if (`SELECT $i=2`)
+  if ($i == 2)
   { 
     -- echo ### Asserts that declaring a blob as part of a unique (not null) key does not break replication
     -- connection mysqld_a
@@ -76,7 +76,7 @@ while($i)
     -- connection mysqld_c
     --eval CREATE TABLE t (c1 int, c2 blob NOT NULL, c3 int, unique key(c2(512))) engine= $mysqld_c_engine;
   }
-  if (`SELECT $i=3`)
+  if ($i == 3)
   {
     -- echo ### Asserts that declaring a blob in a key does not break replication
     -- connection mysqld_a
@@ -87,7 +87,7 @@ while($i)
     --eval CREATE TABLE t (c1 int, c2 blob, c3 int, key(c2(512))) engine= $mysqld_c_engine;
 
   }
-  if (`SELECT $i=4`) {
+  if ($i == 4) {
     -- echo ### Asserts that updates without blobs in the BI (PK exists int the table)
     -- echo ### will not break replication
     -- connection mysqld_a
@@ -98,7 +98,7 @@ while($i)
     --eval CREATE TABLE t (c1 int, c2 blob, c3 int, primary key(c1)) engine= $mysqld_c_engine;
 
   }
-  if (`SELECT $i=5`)
+  if ($i == 5)
   { 
     -- echo ### Asserts that updates without blobs in the BI (UK NOT NULL exists in the table) 
     -- echo ### will not break replication
@@ -110,7 +110,7 @@ while($i)
     --eval CREATE TABLE t (c1 int NOT NULL, c2 blob NOT NULL, c3 int, unique key(c1)) engine= $mysqld_c_engine;
 
   }
-  if (`SELECT $i=6`)
+  if ($i == 6)
   { 
     -- echo ### Asserts that updates without blobs in the AI (they are not updated) 
     -- echo ### will not break replication (check even if there is a key in the table)
@@ -122,7 +122,7 @@ while($i)
     --eval CREATE TABLE t (c1 int, c2 blob, c3 int, key(c1)) engine= $mysqld_c_engine;
 
   }
-  if (`SELECT $i=7`)
+  if ($i == 7)
   { 
     -- echo ### Asserts that updates without blobs in the AI (they are not updated) 
     -- echo ### will not break replication (check when there is no key in the table)

=== modified file 'mysql-test/extra/rpl_tests/rpl_row_img_diff_indexes.test'
--- a/mysql-test/extra/rpl_tests/rpl_row_img_diff_indexes.test	2010-03-30 16:06:36 +0000
+++ b/mysql-test/extra/rpl_tests/rpl_row_img_diff_indexes.test	2010-11-17 12:21:45 +0000
@@ -47,7 +47,7 @@ while($i)
   SET SQL_LOG_BIN=0;
 
 
-  if (`SELECT $i=1`) {
+  if ($i == 1) {
     -- echo ### Different PKs on master and first slave
     -- connection mysqld_a
     --eval CREATE TABLE t (c1 int, c2 blob, c3 int, primary key(c1)) engine= $mysqld_a_engine;
@@ -56,7 +56,7 @@ while($i)
     -- connection mysqld_c 
     --eval CREATE TABLE t (c1 int, c2 blob, c3 int, primary key(c1)) engine= $mysqld_c_engine;
   }
-  if (`SELECT $i=2`)
+  if ($i == 2)
   { 
     -- echo ### Different PKs on master and first slave (which has unique NOT NULL key instead of PK)
     -- connection mysqld_a
@@ -66,7 +66,7 @@ while($i)
     -- connection mysqld_c
     --eval CREATE TABLE t (c1 int, c2 blob NOT NULL, c3 int, primary key(c1)) engine= $mysqld_c_engine;
   }
-  if (`SELECT $i=3`)
+  if ($i == 3)
   { 
     -- echo ### Master with PK and first slave with KEY only
     -- connection mysqld_a
@@ -76,7 +76,7 @@ while($i)
     -- connection mysqld_c
     --eval CREATE TABLE t (c1 int, c2 blob, c3 int, key(c2(512))) engine= $mysqld_c_engine;
   }
-  if (`SELECT $i=4`)
+  if ($i == 4)
   { 
     -- echo ### Master with PK and no keys on the slaves
     -- connection mysqld_a
@@ -86,7 +86,7 @@ while($i)
     -- connection mysqld_c
     --eval CREATE TABLE t (c1 int, c2 blob, c3 int) engine= $mysqld_c_engine;
   }
-  if (`SELECT $i=5`) {
+  if ($i == 5) {
     -- echo ### Master with UK NOT NULL and slaves with PK on different fields
     -- connection mysqld_a
     --eval CREATE TABLE t (c1 int NOT NULL, c2 blob, c3 int, unique key(c1)) engine= $mysqld_a_engine;
@@ -95,7 +95,7 @@ while($i)
     -- connection mysqld_c 
     --eval CREATE TABLE t (c1 int, c2 blob, c3 int, primary key(c1)) engine= $mysqld_c_engine;
   }
-  if (`SELECT $i=6`)
+  if ($i == 6)
   { 
     -- echo ### Master with UK NOT NULL, first slave with UK NOT NULL on different field
     -- connection mysqld_a
@@ -105,7 +105,7 @@ while($i)
     -- connection mysqld_c
     --eval CREATE TABLE t (c1 int, c2 blob NOT NULL, c3 int, primary key(c1)) engine= $mysqld_c_engine;
   }
-  if (`SELECT $i=7`)
+  if ($i == 7)
   { 
     -- echo ### Master with UK NULLABLE, first slave with K on different field second slave with key on yet another different field
       
@@ -116,7 +116,7 @@ while($i)
     -- connection mysqld_c
     --eval CREATE TABLE t (c1 int, c2 blob, c3 int, key(c2(512))) engine= $mysqld_c_engine;
   }
-  if (`SELECT $i=8`)
+  if ($i == 8)
   { 
     -- echo ### Master with UK NULLABLE, slaves with no keys
     -- connection mysqld_a
@@ -126,7 +126,7 @@ while($i)
     -- connection mysqld_c
     --eval CREATE TABLE t (c1 int, c2 blob, c3 int) engine= $mysqld_c_engine;
   }
-  if (`SELECT $i=9`) {
+  if ($i == 9) {
     -- echo ### Master with Key, slaves with PKs on different fields
     -- connection mysqld_a
     --eval CREATE TABLE t (c1 int, c2 blob, c3 int, key(c1)) engine= $mysqld_a_engine;
@@ -135,7 +135,7 @@ while($i)
     -- connection mysqld_c 
     --eval CREATE TABLE t (c1 int, c2 blob, c3 int, primary key(c1)) engine= $mysqld_c_engine;
   }
-  if (`SELECT $i=10`)
+  if ($i == 10)
   { 
     -- echo ### Master with Key, slaves with PKs on different fields (first slave has UK NOT NULL)
     -- connection mysqld_a
@@ -145,7 +145,7 @@ while($i)
     -- connection mysqld_c
     --eval CREATE TABLE t (c1 int, c2 blob NOT NULL, c3 int, primary key(c1)) engine= $mysqld_c_engine;
   }
-  if (`SELECT $i=11`)
+  if ($i == 11)
   { 
     -- echo ### Master with Key, first slave with key on different field and second slave with key on yet another different field.
     -- connection mysqld_a
@@ -155,7 +155,7 @@ while($i)
     -- connection mysqld_c
     --eval CREATE TABLE t (c1 int, c2 blob, c3 int, key(c2(512))) engine= $mysqld_c_engine;
   }
-  if (`SELECT $i=12`)
+  if ($i == 12)
   { 
     -- echo ### Master with Key, slaves with no keys
     -- connection mysqld_a
@@ -165,7 +165,7 @@ while($i)
     -- connection mysqld_c
     --eval CREATE TABLE t (c1 int, c2 blob, c3 int) engine= $mysqld_c_engine;
   }
-  if (`SELECT $i=13`) {
+  if ($i == 13) {
     -- echo ### Master with no key, slaves with PKs on different fields
     -- connection mysqld_a
     --eval CREATE TABLE t (c1 int, c2 blob, c3 int) engine= $mysqld_a_engine;
@@ -174,7 +174,7 @@ while($i)
     -- connection mysqld_c 
     --eval CREATE TABLE t (c1 int, c2 blob, c3 int, primary key(c1)) engine= $mysqld_c_engine;
   }
-  if (`SELECT $i=14`)
+  if ($i == 14)
   { 
     -- echo ### Master with no key, slaves with PKs on different fields (first slave with UK NOT NULL, second with PK)
     -- connection mysqld_a
@@ -184,7 +184,7 @@ while($i)
     -- connection mysqld_c
     --eval CREATE TABLE t (c1 int, c2 blob NOT NULL, c3 int, primary key(c1)) engine= $mysqld_c_engine;
   }
-  if (`SELECT $i=15`)
+  if ($i == 15)
   { 
     -- echo ### Master with no key, slaves with keys
     -- connection mysqld_a
@@ -194,7 +194,7 @@ while($i)
     -- connection mysqld_c
     --eval CREATE TABLE t (c1 int, c2 blob, c3 int, key(c2(512))) engine= $mysqld_c_engine;
   }
-  if (`SELECT $i=16`)
+  if ($i == 16)
   { 
     -- echo ### Master with no keys slaves with no keys as well
     -- connection mysqld_a

=== 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-11-17 12:21:45 +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/rpl_assert.inc'
--- a/mysql-test/include/rpl_assert.inc	2010-09-16 11:00:57 +0000
+++ b/mysql-test/include/rpl_assert.inc	2010-11-17 12:21:45 +0000
@@ -48,9 +48,9 @@ if ($rpl_debug)
 }
 
 # Sanity-check input
-if (`SELECT "$assert_text" = ""`)
+if (!$assert_text)
 {
-  --die ERROR IN TEST: the mysqltest variable rpl_test must be set
+  --die ERROR IN TEST: the mysqltest variable assert_text must be set
 }
 
 # Evaluate square brackets in cond.

=== modified file 'mysql-test/include/rpl_chained_3_hosts.inc'
--- a/mysql-test/include/rpl_chained_3_hosts.inc	2010-03-30 16:06:36 +0000
+++ b/mysql-test/include/rpl_chained_3_hosts.inc	2010-11-17 12:21:45 +0000
@@ -13,17 +13,17 @@ connect (mysqld_c,127.0.0.1,root,,test,$
 
 while($i)
 {
-  if(`SELECT $i= 3`)
+  if($i == 3)
   {
     -- connection mysqld_a
   }
 
-  if(`SELECT $i= 2`)
+  if($i == 2)
   {
     -- connection mysqld_b
   }
 
-  if(`SELECT $i= 1`)
+  if($i == 1)
   {
     -- connection mysqld_c
   }

=== modified file 'mysql-test/include/rpl_row_img_set.inc'
--- a/mysql-test/include/rpl_row_img_set.inc	2010-03-30 16:06:36 +0000
+++ b/mysql-test/include/rpl_row_img_set.inc	2010-11-17 12:21:45 +0000
@@ -39,7 +39,7 @@ while (`SELECT HEX('$row_img_set') != HE
   -- eval SET SESSION binlog_row_image= '$rimg'
   -- eval SET GLOBAL binlog_row_image= '$rimg'
 
-  if (`SELECT '$is_slave_restart' = 'Y'`)
+  if ($is_slave_restart == Y)
   {
     -- source include/stop_slave.inc
     -- source include/start_slave.inc

=== modified file 'mysql-test/include/show_slave_status.inc'
--- a/mysql-test/include/show_slave_status.inc	2010-08-05 17:45:25 +0000
+++ b/mysql-test/include/show_slave_status.inc	2010-11-17 12:21:45 +0000
@@ -2,7 +2,7 @@
 # that varies depending on where the test is executed.
 
 --let $_items=$status_items
-if (`SELECT "XX$status_items" = "XX"`)
+if (!$status_items)
 {
   --die 'Variable status_items is NULL' 
 }
@@ -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/include/wait_for_binlog_event.inc'
--- a/mysql-test/include/wait_for_binlog_event.inc	2010-05-24 13:54:08 +0000
+++ b/mysql-test/include/wait_for_binlog_event.inc	2010-11-17 12:21:45 +0000
@@ -24,7 +24,7 @@ while (`SELECT INSTR("$_last_event","$wa
   real_sleep 0.1;
   let $_event= query_get_value(SHOW BINLOG EVENTS, Info, $_event_pos);
   let $_last_event= $_event;
-  while (`SELECT "$_event" != "No such row"`)
+  while ($_event != No such row)
   {
     inc $_event_pos;
     let $_last_event= $_event;

=== modified file 'mysql-test/suite/perfschema/t/setup_actors.test'
--- a/mysql-test/suite/perfschema/t/setup_actors.test	2010-11-09 14:34:29 +0000
+++ b/mysql-test/suite/perfschema/t/setup_actors.test	2010-11-17 12:21:45 +0000
@@ -100,7 +100,7 @@ let $con2_thread_id= `select THREAD_ID f
 --echo # Switch to connection default
 --connection default
 # If a thread dies, we don't expect its THREAD_ID value will be re-used.
-if (`SELECT $con2_thread_id <= $con1_thread_id`)
+if ($con2_thread_id <= $con1_thread_id)
 {
    --echo ERROR: THREAD_ID of con2 is not bigger than THREAD_ID of con1
    eval SELECT $con2_thread_id as THREAD_ID_con2, $con1_thread_id THREAD_ID_con1;

=== modified file 'mysql-test/suite/rpl/t/rpl_change_master.test'
--- a/mysql-test/suite/rpl/t/rpl_change_master.test	2010-11-17 10:23:22 +0000
+++ b/mysql-test/suite/rpl/t/rpl_change_master.test	2010-11-17 12:21:45 +0000
@@ -141,7 +141,7 @@ if (`SELECT $retry_count1 <> ($retry_cou
 
 -- let $retry_count2= query_get_value(SHOW SLAVE STATUS, Master_Retry_Count, 1)
 # assertion: it shows no changes
-if (`SELECT $retry_count2 <> $retry_count1`)
+if ($retry_count2 != $retry_count1)
 {
   -- echo Unexpected retry count value! Got: $retry_count2, expected: $retry_count1
   -- die
@@ -156,7 +156,7 @@ CHANGE MASTER TO master_retry_count=1;
 
 -- let $retry_count3= query_get_value(SHOW SLAVE STATUS, Master_Retry_Count, 1)
 # assertion: it should show 1
-if (`SELECT $retry_count3 <> 1`)
+if ($retry_count3 != 1)
 {
   -- echo Unexpected retry count value! Got: $retry_count3, expected: 1
   -- die
@@ -171,7 +171,7 @@ if (`SELECT $retry_count3 <> 1`)
 
 -- let $retry_count4= query_get_value(SHOW SLAVE STATUS, Master_Retry_Count, 1)
 # assertion: it should show 1
-if (`SELECT $retry_count4 <> $retry_count0`)
+if ($retry_count4 != $retry_count0)
 {
   -- echo Unexpected retry count value! Got: $retry_count4, expected: $retry_count0
   -- die
@@ -200,7 +200,7 @@ if (`SELECT $retry_count4 <> $retry_coun
 -- let $retry_count_before= query_get_value(SHOW SLAVE STATUS, Master_Retry_Count, 1)
 -- eval CHANGE MASTER TO master_connect_retry= $connect_retry_new
 -- let $retry_count_after= query_get_value(SHOW SLAVE STATUS, Master_Retry_Count, 1)
-if (`SELECT $retry_count_before <> $retry_count_after`)
+if ($retry_count_before != $retry_count_after)
 {
   -- echo Unexpected retry count value! Got: $retry_count_after, expected: $retry_count_before
   -- die
@@ -226,7 +226,7 @@ EOF
 -- source include/start_slave.inc
 
 -- let $retry_count5= query_get_value(SHOW SLAVE STATUS, Master_Retry_Count, 1)
-if (`SELECT $retry_count5 <> $retry_count_expected`)
+if ($retry_count5 != $retry_count_expected)
 {
   -- echo Unexpected retry count value! Got: $retry_count5, expected: $retry_count_expected
   -- die

=== modified file 'mysql-test/suite/rpl/t/rpl_delayed_slave.test'
--- a/mysql-test/suite/rpl/t/rpl_delayed_slave.test	2010-09-16 11:00:57 +0000
+++ b/mysql-test/suite/rpl/t/rpl_delayed_slave.test	2010-11-17 12:21:45 +0000
@@ -72,7 +72,7 @@ call mtr.add_suppression("Unsafe stateme
 #  - If we execute a query on master and wait $time3 seconds, then the
 #    query has been executed.
 --let $time1= 10
-if (`SELECT '$max_query_execution_time' > 0`) {
+if ($max_query_execution_time) {
   --let $time1= $max_query_execution_time
 }
 --let $time2= `SELECT 2 * $time1`

=== modified file 'mysql-test/suite/rpl/t/rpl_packet.test'
--- a/mysql-test/suite/rpl/t/rpl_packet.test	2010-11-09 12:02:20 +0000
+++ b/mysql-test/suite/rpl/t/rpl_packet.test	2010-11-17 12:21:45 +0000
@@ -206,12 +206,12 @@ SET @@global.max_allowed_packet=1048576;
 
 while($i)
 {
-  if(`SELECT $i=1`)
+  if($i==1)
   {
     --let $flags=--start-position=$start_pos
   }
 
-  if(`SELECT $i=2`)
+  if($i==2)
   {
     --let $flags=--base64-output=decode-rows -v
   }

=== modified file 'mysql-test/suite/rpl/t/rpl_read_old_relay_log_info.test'
--- a/mysql-test/suite/rpl/t/rpl_read_old_relay_log_info.test	2010-06-21 10:44:26 +0000
+++ b/mysql-test/suite/rpl/t/rpl_read_old_relay_log_info.test	2010-11-17 12:21:45 +0000
@@ -18,9 +18,7 @@ RESET SLAVE;
 
 # the old version of relay_log.info comes in two versions: with path
 # separator '/' (most systems) and with path separator '\' (windows)
---let $escaped_path_separator= \
---let $escaped_path_separator= $escaped_path_separator$SYSTEM_PATH_SEPARATOR
-if (`SELECT '$escaped_path_separator' != '/'`) {
+if ($SYSTEM_PATH_SEPARATOR != /) {
   --let $file_suffix= -win
 }
 --copy_file $MYSQL_TEST_DIR/std_data/old-format-relay-log$file_suffix.info $MYSQLD_DATADIR/relay-log.info

=== modified file 'mysql-test/suite/rpl/t/rpl_seconds_behind_master.test'
--- a/mysql-test/suite/rpl/t/rpl_seconds_behind_master.test	2010-05-04 10:35:47 +0000
+++ b/mysql-test/suite/rpl/t/rpl_seconds_behind_master.test	2010-11-17 12:21:45 +0000
@@ -149,7 +149,7 @@ let $condition= = 'Slave has read all re
 -- source include/wait_show_condition.inc
 
 -- let $sbm= query_get_value("SHOW SLAVE STATUS", Seconds_Behind_Master, 1)
-if (`SELECT $sbm <> 0`)
+if ($sbm != 0)
 {
   -- echo #### Seconds behind master must show '0', because SQL thread is now waiting for new events.
   -- echo #### SBM ($sbm seconds) != 0 !! SQL thread is waiting so should be zero.
@@ -186,7 +186,7 @@ let $condition= = 'INSERT INTO t1 VALUES
 -- source include/wait_show_condition.inc
 
 -- let $sbm= query_get_value("SHOW SLAVE STATUS", Seconds_Behind_Master, 1)
-if (`SELECT $sbm < 3600`)
+if ($sbm < 3600)
 {
   -- echo #### Seconds behind master must show > 3600 because the event that 
   -- echo #### is being processed was issued 3600 seconds ago.

=== modified file 'mysql-test/suite/rpl/t/rpl_server_uuid.test'
--- a/mysql-test/suite/rpl/t/rpl_server_uuid.test	2010-10-08 14:23:55 +0000
+++ b/mysql-test/suite/rpl/t/rpl_server_uuid.test	2010-11-17 12:21:45 +0000
@@ -51,7 +51,7 @@ connection slave;
 --let $slave_param_value= $master_uuid_on_master
 source include/check_slave_param.inc;
 
-if (`SELECT '$slave_uuid_on_slave' <> '$slave_uuid_on_master'`)
+if ($slave_uuid_on_slave != $slave_uuid_on_master)
 {
   --echo slave_uuid_on_slave <> slave_uuid_on_master
   --echo $slave_uuid_on_slave <> $slave_uuid_on_master

=== modified file 'mysql-test/t/server_uuid.test'
--- a/mysql-test/t/server_uuid.test	2010-06-22 09:34:59 +0000
+++ b/mysql-test/t/server_uuid.test	2010-11-17 12:21:45 +0000
@@ -68,7 +68,7 @@ if (`SELECT '$server_uuid' = '' OR '$ser
 --source include/restart_mysqld.inc
 
 --let $server_uuid= query_get_value(SELECT @@SERVER_UUID, @@SERVER_UUID, 1)
-if (`SELECT '$server_uuid' <> '$original_server_uuid'`)
+if ($server_uuid != $original_server_uuid)
 {
-  --echo $server_uuid<> $original_server_uuid
+  --echo $server_uuid != $original_server_uuid
 }


Attachment: [text/bzr-bundle] bzr/bjorn.munch@oracle.com-20101117122145-nh1py01ubjmb1k3j.bundle
Thread
bzr commit into mysql-trunk-mtr branch (bjorn.munch:2987) Bjorn Munch17 Nov