Updated new tests from Lars review

mysql-test/include/rpl_multi_engine3.inc

@@ -4,51 +4,59 @@
 # Purpose: To reuse through out test and make maint easier
 #############################################################
 connection master;
---disable_query_log
-select "--- Insert into t1 --" as "";
-INSERT INTO t1 VALUES(42,1,'Testing MySQL databases is a cool ', 'Must make it bug free for the customer',654321.4321,15.21,0,1965,"1905-11-14");
-INSERT INTO t1 VALUES(2,1,'Testing MySQL databases is a cool ', 'Must make it bug free for the customer',654321.4321,15.21,0,1965,"1965-11-14");
-INSERT INTO t1 VALUES(4,1,'Testing MySQL databases is a cool ', 'Must make it bug free for the customer',654321.4321,15.21,0,1965,"1985-11-14");
-INSERT INTO t1 VALUES(142,1,'Testing MySQL databases is a cool ', 'Must make it bug free for the customer',654321.4321,15.21,0,1965,"1995-11-14");
-INSERT INTO t1 VALUES(412,1,'Testing MySQL databases is a cool ', 'Must make it bug free for the customer',654321.4321,15.21,0,1965,"2005-11-14");
-select "--- Select from t1 on master --" as "";
---enable_query_log
+--echo "--- Insert into t1 --" as "";
+
+--disable_query_log
+INSERT INTO t1 VALUES(42,1,'Testing MySQL databases is a cool ',
+                      'Must make it bug free for the customer',
+                       654321.4321,15.21,0,1965,"1905-11-14");
+INSERT INTO t1 VALUES(2,1,'Testing MySQL databases is a cool ',
+                      'Must make it bug free for the customer',
+                       654321.4321,15.21,0,1965,"1965-11-14");
+INSERT INTO t1 VALUES(4,1,'Testing MySQL databases is a cool ',
+                      'Must make it bug free for the customer',
+                       654321.4321,15.21,0,1965,"1985-11-14");
+INSERT INTO t1 VALUES(142,1,'Testing MySQL databases is a cool ',
+                      'Must make it bug free for the customer',
+                       654321.4321,15.21,0,1965,"1995-11-14");
+INSERT INTO t1 VALUES(412,1,'Testing MySQL databases is a cool ',
+                      'Must make it bug free for the customer',
+                       654321.4321,15.21,0,1965,"2005-11-14");
+--enable_query_log
+
+--echo --- Select from t1 on master --- 
 select id,hex(b1),vc,bc,d,f,total,y,t from t1 order by id;
+
 sync_slave_with_master;
---disable_query_log
-select "--- Select from t1 on slave --" as "";
---enable_query_log
+--echo --- Select from t1 on slave ---
 select id,hex(b1),vc,bc,d,f,total,y,t from t1 order by id;
+
 connection master;
---disable_query_log
-select "--- Update t1 on master --" as "";
---enable_query_log
+
+--echo --- Update t1 on master --
 UPDATE t1 SET b1 = 0, t="2006-02-22" WHERE id = 412;
---disable_query_log
-select "--- Check the update on master --" as "";
---enable_query_log
+
+--echo --- Check the update on master --- 
 SELECT id,hex(b1),vc,bc,d,f,total,y,t FROM t1 WHERE id = 412;
+
 # Must give injector thread a little time to get update
 # into the binlog other wise we will miss the update.
 sleep 3;
+
 sync_slave_with_master;
---disable_query_log
-select "--- Check Update on slave --" as "";
---enable_query_log
+--echo --- Check Update on slave ---
 SELECT id,hex(b1),vc,bc,d,f,total,y,t FROM t1 WHERE id = 412;
+
 connection master;
---disable_query_log
-select "--- Remove a record from t1 on master --" as "";
---enable_query_log
+--echo --- Remove a record from t1 on master ---
 DELETE FROM t1 WHERE id = 42;
---disable_query_log
-select "--- Show current count on master for t1 --" as "";
---enable_query_log
+
+--echo --- Show current count on master for t1 ---
 SELECT COUNT(*) FROM t1;
+
 sync_slave_with_master;
---disable_query_log
-select "--- Show current count on slave for t1 --" as "";
---enable_query_log
+--echo --- Show current count on slave for t1 --- 
 SELECT COUNT(*) FROM t1;
+
 connection master;
 DELETE FROM t1;