bk commit into 5.1 tree (lars:1.2160)

[Lars Thalmann]

Below is the list of changes that have just been committed into a local
5.1 repository of lthalmann. When lthalmann 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.2160 06/03/09 16:30:59 lars@stripped +2 -0
  Test fixes

  mysql-test/t/ndb_binlog_ddl_multi.test
    1.8 06/03/09 16:30:46 lars@stripped +6 -23
    Use show_binlog_events.inc file

  mysql-test/include/show_binlog_events.inc
    1.2 06/03/09 16:30:44 lars@stripped +1 -0
    Mask table id from binlog output

# 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:	lars
# Host:	dl145j.mysql.com
# Root:	/users/lthalmann/bk/mysql-5.1-new-wl3023-mats

--- 1.1/mysql-test/include/show_binlog_events.inc	2006-03-09 01:04:06 +01:00
+++ 1.2/mysql-test/include/show_binlog_events.inc	2006-03-09 16:30:44 +01:00
@@ -1,4 +1,5 @@
 --let $binlog_start=102
 --replace_result $binlog_start <binlog_start>
 --replace_column 2 # 4 # 5 #
+--replace_regex /table_id: [0-9]+/table_id: #/
 --eval show binlog events from $binlog_start

--- 1.7/mysql-test/t/ndb_binlog_ddl_multi.test	2006-03-09 16:12:50 +01:00
+++ 1.8/mysql-test/t/ndb_binlog_ddl_multi.test	2006-03-09 16:30:46 +01:00
@@ -31,15 +31,10 @@
 
 --connection server2
 create table t2 (a int primary key) engine=ndb;
---replace_result $binlog_start <binlog_start>
---replace_column 2 # 4 # 5 # 
---eval show binlog events from $binlog_start
+--source include/show_binlog_events.inc
 
 --connection server1
---replace_result $binlog_start <binlog_start>
---replace_column 2 # 4 # 5 # 
---replace_regex /table_id: [0-9]+/table_id: #/
---eval show binlog events from $binlog_start
+--source include/show_binlog_events.inc
 
 # alter table
 --connection server1
@@ -51,10 +46,7 @@
 alter table t2 add column (b int);
 
 --connections server1
---replace_result $binlog_start <binlog_start>
---replace_column 2 # 4 # 5 # 
---replace_regex /table_id: [0-9]+/table_id: #/
---eval show binlog events from $binlog_start
+--source include/show_binlog_events.inc
 
 # alter database
 --connection server1
@@ -71,10 +63,7 @@
 drop table mysqltest.t1;
 
 --connection server1
---replace_result $binlog_start <binlog_start>
---replace_column 2 # 4 # 5 # 
---replace_regex /table_id: [0-9]+/table_id: #/
---eval show binlog events from $binlog_start
+--source include/show_binlog_events.inc
 
 
 # drop database and drop should come after data events
@@ -90,10 +79,7 @@
 create table t1 (a int primary key) engine=ndb;
 
 --connection server2
---replace_result $binlog_start <binlog_start>
---replace_column 2 # 4 # 5 # 
---replace_regex /table_id: [0-9]+/table_id: #/
---eval show binlog events from $binlog_start
+--source include/show_binlog_events.inc
 
 --connection server2
 drop table t2;
@@ -144,10 +130,7 @@
 drop table t1;
 
 --connection server2
---replace_result $binlog_start <binlog_start>
---replace_column 2 # 4 # 5 # 
---replace_regex /table_id: [0-9]+/table_id: #/
---eval show binlog events from $binlog_start
+--source include/show_binlog_events.inc
 
 #
 # Bug #17827 cluster: rename of several tables in one statement,