Merge mysql.com:/home/bkroot/mysql-5.1-new

into  mysql.com:/home/bk/w3023-mysql-5.1-new


configure.in:
  Auto merged
BitKeeper/deleted/.del-sp_notembedded.test:
  Auto merged
mysql-test/extra/binlog_tests/binlog.test:
  Auto merged
mysql-test/extra/binlog_tests/blackhole.test:
  Auto merged
mysql-test/r/binlog_stm_ctype_cp932.result:
  Auto merged
mysql-test/t/sp.test:
  Auto merged
scripts/mysql_fix_privilege_tables.sql:
  Auto merged
sql/ha_ndbcluster_binlog.cc:
  Auto merged
sql/handler.cc:
  Auto merged
sql/handler.h:
  Auto merged
sql/log.h:
  Auto merged
sql/log_event.h:
  Auto merged
sql/mysql_priv.h:
  Auto merged
sql/opt_range.cc:
  Auto merged
sql/sql_base.cc:
  Auto merged
sql/sql_class.h:
  Auto merged
sql/sql_parse.cc:
  Auto merged
sql/sql_table.cc:
  Auto merged
sql/sql_update.cc:
  Auto merged
sql/table.h:
  Auto merged

1 files changed, 19 insertions, 35 deletions

diff --git a/mysql-test/include/rpl_row_basic.inc b/mysql-test/include/rpl_row_basic.inc
index 9f1cc186388..ea2c4c1688c 100644
--- a/mysql-test/include/rpl_row_basic.inc
+++ b/mysql-test/include/rpl_row_basic.inc
@@ -174,22 +174,16 @@ SELECT C1,HEX(B1),HEX(B2) FROM t4 ORDER BY C1;
 connection master;
 eval CREATE TABLE t7 (C1 INT PRIMARY KEY, C2 INT) ENGINE = $type ;
 sync_slave_with_master;
---disable_query_log
-SELECT "--- on slave: original values ---" AS "";
---enable_query_log
+--echo --- on slave: original values ---
 INSERT INTO t7 VALUES (1,3), (2,6), (3,9);
 SELECT * FROM t7 ORDER BY C1;
 
 connection master;
---disable_query_log
-SELECT "--- on master: new values inserted ---" AS "";
---enable_query_log
+--echo --- on master: new values inserted ---
 INSERT INTO t7 VALUES (1,2), (2,4), (3,6);
 SELECT * FROM t7 ORDER BY C1;
 sync_slave_with_master;
---disable_query_log
-SELECT "--- on slave: old values should be overwritten by replicated values ---" AS "";
---enable_query_log
+--echo --- on slave: old values should be overwritten by replicated values ---
 SELECT * FROM t7 ORDER BY C1;
 
 #
@@ -197,42 +191,33 @@ SELECT * FROM t7 ORDER BY C1;
 # causing a conflict for a key that is not "last".
 #
 connection master;
---disable_query_log
-SELECT "--- on master ---" AS "";
---enable_query_log
-DROP TABLE t7;
-eval CREATE TABLE t7 (a INT PRIMARY KEY, b INT UNIQUE, c INT UNIQUE) ENGINE = $type ;
+--echo --- on master ---
+eval CREATE TABLE t8 (a INT PRIMARY KEY, b INT UNIQUE, c INT UNIQUE) ENGINE = $type ;
 
 # First we make sure that the constraints are correctly set.
-INSERT INTO t7 VALUES (99,99,99);
+INSERT INTO t8 VALUES (99,99,99);
 --error 1062
-INSERT INTO t7 VALUES (99,22,33);
+INSERT INTO t8 VALUES (99,22,33);
 --error 1062
-INSERT INTO t7 VALUES (11,99,33);
+INSERT INTO t8 VALUES (11,99,33);
 --error 1062
-INSERT INTO t7 VALUES (11,22,99);
-SELECT * FROM t7 ORDER BY a;
+INSERT INTO t8 VALUES (11,22,99);
+SELECT * FROM t8 ORDER BY a;
 
 sync_slave_with_master;
---disable_query_log
-SELECT "--- on slave ---" AS "";
---enable_query_log
-SELECT * FROM t7 ORDER BY a;
-INSERT INTO t7 VALUES (1,2,3), (2,4,6), (3,6,9);
-SELECT * FROM t7 ORDER BY a;
+--echo --- on slave ---
+SELECT * FROM t8 ORDER BY a;
+INSERT INTO t8 VALUES (1,2,3), (2,4,6), (3,6,9);
+SELECT * FROM t8 ORDER BY a;
 
 connection master;
---disable_query_log
-SELECT "--- on master ---" AS "";
---enable_query_log
+--echo --- on master ---
 # We insert a row that will cause conflict on the primary key but not
 # on the other keys.
-INSERT INTO t7 VALUES (2,4,8);
+INSERT INTO t8 VALUES (2,4,8);
 sync_slave_with_master;
---disable_query_log
-SELECT "--- on slave ---" AS "";
---enable_query_log
-SELECT * FROM t7 ORDER BY a;
+--echo --- on slave ---
+SELECT * FROM t8 ORDER BY a;
 
 #
 # Test conflicting operations when changing in a table referenced by a
@@ -245,5 +230,4 @@ SELECT * FROM t7 ORDER BY a;
 #
 
 connection master;
-DROP TABLE IF EXISTS t1,t2,t3,t4,t5,t6,t7;
-sync_slave_with_master;
+DROP TABLE IF EXISTS t1,t2,t3,t4,t5,t6,t7,t8;