bk commit into 5.1 tree (lars:1.2524)

[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@stripped, 2007-05-30 11:55:56+02:00, lars@stripped +3 -0
  Added extra parenthesis to remove compiler warning
  Fixed test case rpl_incident.test (synchronize drop table, masked IO thread behaviour)

  mysql-test/r/rpl_incident.result@stripped, 2007-05-30 11:55:53+02:00, lars@stripped +2 -3
    Masking master_log_file since IO thread is not synchronized in rpl_incident.test

  mysql-test/t/rpl_incident.test@stripped, 2007-05-30 11:55:53+02:00, lars@stripped +3 -4
    Masking master_log_file since IO thread is not synchronized in rpl_incident.test
    Correcting drop of table so it is synchronized

  sql/log_event.cc@stripped, 2007-05-30 11:55:53+02:00, lars@stripped +1 -1
    Added extra parenthesis to remove compiler warning

# 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:	dl145k.mysql.com
# Root:	/nfsdisk1/lars/bk/mysql-5.1-new-rpl

--- 1.280/sql/log_event.cc	2007-05-30 11:56:05 +02:00
+++ 1.281/sql/log_event.cc	2007-05-30 11:56:05 +02:00
@@ -6809,7 +6809,7 @@ int Write_rows_log_event::do_after_row_o
     fires bug#27077
     todo: explain or fix
   */
-  if (local_error= table->file->ha_end_bulk_insert())
+  if ((local_error= table->file->ha_end_bulk_insert()))
   {
     table->file->print_error(local_error, MYF(0));
   }

--- 1.5/mysql-test/r/rpl_incident.result	2007-05-30 11:56:05 +02:00
+++ 1.6/mysql-test/r/rpl_incident.result	2007-05-30 11:56:05 +02:00
@@ -31,7 +31,7 @@ Master_Host	127.0.0.1
 Master_User	root
 Master_Port	MASTER_PORT
 Connect_Retry	1
-Master_Log_File	master-bin.000002
+Master_Log_File	#
 Read_Master_Log_Pos	#
 Relay_Log_File	#
 Relay_Log_Pos	#
@@ -74,7 +74,7 @@ Master_Host	127.0.0.1
 Master_User	root
 Master_Port	MASTER_PORT
 Connect_Retry	1
-Master_Log_File	master-bin.000002
+Master_Log_File	#
 Read_Master_Log_Pos	#
 Relay_Log_File	#
 Relay_Log_Pos	#
@@ -103,5 +103,4 @@ Master_SSL_Cipher	
 Master_SSL_Key	
 Seconds_Behind_Master	#
 Master_SSL_Verify_Server_Cert	No
-DROP TABLE t1;
 DROP TABLE t1;

--- 1.3/mysql-test/t/rpl_incident.test	2007-05-30 11:56:05 +02:00
+++ 1.4/mysql-test/t/rpl_incident.test	2007-05-30 11:56:05 +02:00
@@ -22,7 +22,7 @@ connection slave;
 SELECT * FROM t1;
 
 --replace_result $MASTER_MYPORT MASTER_PORT
---replace_column 1 # 7 # 8 # 9 # 22 # 23 # 33 #
+--replace_column 1 # 6 # 7 # 8 # 9 # 22 # 23 # 33 #
 --query_vertical SHOW SLAVE STATUS
 
 SET GLOBAL SQL_SLAVE_SKIP_COUNTER=1;
@@ -34,10 +34,9 @@ START SLAVE;
 
 SELECT * FROM t1;
 --replace_result $MASTER_MYPORT MASTER_PORT
---replace_column 1 # 7 # 8 # 9 # 22 # 23 # 33 #
+--replace_column 1 # 6 # 7 # 8 # 9 # 22 # 23 # 33 #
 --query_vertical SHOW SLAVE STATUS
 
-DROP TABLE t1;
 connection master;
 DROP TABLE t1;
-
+--sync_slave_with_master