bk commit into 5.0 tree (guilhem:1.1987)

[guilhem]

Below is the list of changes that have just been committed into a local
5.0 repository of guilhem. When guilhem does a push these changes will
be propagated to the main repository and, within 24 hours after the
push, to the public repository.
For information on how to access the public repository
see http://dev.mysql.com/doc/mysql/en/installing-source-tree.html

ChangeSet
  1.1987 05/09/21 14:33:02 guilhem@stripped +2 -0
  WL#1012: test fixes after running the 4 testsuites of "make test-force". Note that:
  * --ps-protocol with row-based fails a lot (nothing new)
  * binlog_stm_binlog and binlog_stm_mix_innodb_myisam fail (not due to my changes).

  mysql-test/t/rpl_row_delayed_ins.test
    1.4 05/09/21 14:32:58 guilhem@stripped +3 -2
    I disable my new test in stmt-based as I do SHOW BINLOG EVENTS; no big deal as
    anyway this test was created for RBR (we know stmt-based binlogging of INSERT DELAYED
    is ok). No SHOW BINLOG EVENTS on slave as it would require a RESET MASTER on slave
    and the important thing is what is in the master's binlog.

  mysql-test/r/rpl_row_delayed_ins.result
    1.3 05/09/21 14:32:58 guilhem@stripped +0 -7
    result update

# This is a BitKeeper patch.  What follows are the unified diffs for the
# set of deltas contained in the patch.  The rest of the patch, the part
# that BitKeeper cares about, is below these diffs.
# User:	guilhem
# Host:	gbichot3.local
# Root:	/home/mysql_src/mysql-5.0-wl1012

--- 1.2/mysql-test/r/rpl_row_delayed_ins.result	2005-09-20 23:12:15 +02:00
+++ 1.3/mysql-test/r/rpl_row_delayed_ins.result	2005-09-21 14:32:58 +02:00
@@ -23,11 +23,4 @@
 1
 2
 3
-show binlog events;
-Log_name	Pos	Event_type	Server_id	End_log_pos	Info
-slave-bin.000001	4	Format_desc	2	102	<info>
-slave-bin.000001	102	Query	2	212	<info>
-slave-bin.000001	212	Query	1	332	<info>
-slave-bin.000001	332	Table_map	1	369	<info>
-slave-bin.000001	369	Write_rows	1	411	<info>
 drop table t1;

--- 1.3/mysql-test/t/rpl_row_delayed_ins.test	2005-09-20 23:19:44 +02:00
+++ 1.4/mysql-test/t/rpl_row_delayed_ins.test	2005-09-21 14:32:58 +02:00
@@ -1,4 +1,7 @@
 # See if INSERT DELAYED gets replicated
+# Only in row-based, as we do SHOW BINLOG EVENTS
+
+-- source include/have_binlog_format_row.inc
 -- source include/master-slave.inc
 
 connection master;
@@ -14,8 +17,6 @@
 show binlog events;
 sync_slave_with_master;
 select * from t1;
---replace_column 6 <info>
-show binlog events;
 connection master;
 drop table t1;
 sync_slave_with_master;