bk commit into 5.1 tree (aelkin:1.2346)

[Andrei Elkin]

Below is the list of changes that have just been committed into a local
5.1 repository of elkin. When elkin 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@stripped, 2006-09-27 13:05:29+03:00, aelkin@stripped
+2 -0
  One more fix for binlog_row_binlog due to interminism of checking with
  SHOW BINLOG event. The latter should be either fixed or replaced to favor
  reading from binlog as the check.

  mysql-test/extra/binlog_tests/binlog_insert_delayed.test@stripped, 2006-09-27 13:05:24+03:00,
aelkin@stripped +7 -3
    interminism of binlogging of multi-row insert delayed forced to relocate the show

  mysql-test/r/binlog_row_binlog.result@stripped, 2006-09-27 13:05:24+03:00,
aelkin@stripped +13 -21
    new results

# 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:	aelkin
# Host:	dsl-hkigw8-feb9fb00-191.dhcp.inet.fi
# Root:	/home/elkin/MySQL/TEAM/BARE/mysql-5.1-new-rpl

--- 1.3/mysql-test/extra/binlog_tests/binlog_insert_delayed.test	2006-09-27 13:05:39
+03:00
+++ 1.4/mysql-test/extra/binlog_tests/binlog_insert_delayed.test	2006-09-27 13:05:39
+03:00
@@ -20,6 +20,13 @@ insert delayed into t1 values (300);
 inc $count;
 --source include/wait_until_rows_count.inc
 
+# moving binlog check affront of multi-rows queries which work is indeterministic (extra
table_maps)
+# todo: better check is to substitute SHOW BINLOG with reading from binlog, probably
bug#19459 is in
+# the way
+--replace_column 2 # 5 #
+--replace_regex /table_id: [0-9]+/table_id: #/
+show binlog events from 102;
+
 insert delayed into t1 values (null),(null),(null),(null);
 inc $count; inc $count; inc $count; inc $count;
 --source include/wait_until_rows_count.inc
@@ -32,7 +39,4 @@ inc $count; inc $count; inc $count; inc 
 --echo $count == $rows_inserted
 
 select * from t1;
---replace_column 2 # 5 #
---replace_regex /table_id: [0-9]+/table_id: #/
-show binlog events from 102;
 drop table t1;

--- 1.7/mysql-test/r/binlog_row_binlog.result	2006-09-27 13:05:39 +03:00
+++ 1.8/mysql-test/r/binlog_row_binlog.result	2006-09-27 13:05:39 +03:00
@@ -250,6 +250,19 @@ set @@session.auto_increment_increment=1
 insert delayed into t1 values (207);
 insert delayed into t1 values (null);
 insert delayed into t1 values (300);
+show binlog events from 102;
+Log_name	Pos	Event_type	Server_id	End_log_pos	Info
+master-bin.000001	#	Query	1	#	use `test`; create table t1 (id tinyint auto_increment
primary key)
+master-bin.000001	#	Table_map	1	#	table_id: # (test.t1)
+master-bin.000001	#	Write_rows	1	#	table_id: # flags: STMT_END_F
+master-bin.000001	#	Query	1	#	use `test`; drop table t1
+master-bin.000001	#	Query	1	#	use `test`; create table t1 (a int not null auto_increment,
primary key (a)) engine=myisam
+master-bin.000001	#	Table_map	1	#	table_id: # (test.t1)
+master-bin.000001	#	Write_rows	1	#	table_id: # flags: STMT_END_F
+master-bin.000001	#	Table_map	1	#	table_id: # (test.t1)
+master-bin.000001	#	Write_rows	1	#	table_id: # flags: STMT_END_F
+master-bin.000001	#	Table_map	1	#	table_id: # (test.t1)
+master-bin.000001	#	Write_rows	1	#	table_id: # flags: STMT_END_F
 insert delayed into t1 values (null),(null),(null),(null);
 insert delayed into t1 values (null),(null),(400),(null);
 11 == 11
@@ -266,25 +279,4 @@ a
 306
 400
 401
-show binlog events from 102;
-Log_name	Pos	Event_type	Server_id	End_log_pos	Info
-master-bin.000001	#	Query	1	#	use `test`; create table t1 (id tinyint auto_increment
primary key)
-master-bin.000001	#	Table_map	1	#	table_id: # (test.t1)
-master-bin.000001	#	Write_rows	1	#	table_id: # flags: STMT_END_F
-master-bin.000001	#	Query	1	#	use `test`; drop table t1
-master-bin.000001	#	Query	1	#	use `test`; create table t1 (a int not null auto_increment,
primary key (a)) engine=myisam
-master-bin.000001	#	Table_map	1	#	table_id: # (test.t1)
-master-bin.000001	#	Write_rows	1	#	table_id: # flags: STMT_END_F
-master-bin.000001	#	Table_map	1	#	table_id: # (test.t1)
-master-bin.000001	#	Write_rows	1	#	table_id: # flags: STMT_END_F
-master-bin.000001	#	Table_map	1	#	table_id: # (test.t1)
-master-bin.000001	#	Write_rows	1	#	table_id: # flags: STMT_END_F
-master-bin.000001	#	Table_map	1	#	table_id: # (test.t1)
-master-bin.000001	#	Write_rows	1	#	table_id: # flags: STMT_END_F
-master-bin.000001	#	Table_map	1	#	table_id: # (test.t1)
-master-bin.000001	#	Write_rows	1	#	table_id: # flags: STMT_END_F
-master-bin.000001	#	Table_map	1	#	table_id: # (test.t1)
-master-bin.000001	#	Write_rows	1	#	table_id: # flags: STMT_END_F
-master-bin.000001	#	Table_map	1	#	table_id: # (test.t1)
-master-bin.000001	#	Write_rows	1	#	table_id: # flags: STMT_END_F
 drop table t1;