Merge mysql.com:/home/bkroot/mysql-4.1

into mysql.com:/home/bk/bXXX-mysql-5.0


mysql-test/r/rpl_deadlock.result:
  Auto merged
mysql-test/t/rpl_deadlock.test:
  Auto merged

mysql-test/r/rpl_deadlock.result

@@ -84,4 +84,4 @@ a
 show slave status;
 Slave_IO_State	Master_Host	Master_User	Master_Port	Connect_Retry	Master_Log_File	Read_Master_Log_Pos	Relay_Log_File	Relay_Log_Pos	Relay_Master_Log_File	Slave_IO_Running	Slave_SQL_Running	Replicate_Do_DB	Replicate_Ignore_DB	Replicate_Do_Table	Replicate_Ignore_Table	Replicate_Wild_Do_Table	Replicate_Wild_Ignore_Table	Last_Errno	Last_Error	Skip_Counter	Exec_Master_Log_Pos	Relay_Log_Space	Until_Condition	Until_Log_File	Until_Log_Pos	Master_SSL_Allowed	Master_SSL_CA_File	Master_SSL_CA_Path	Master_SSL_Cert	Master_SSL_Cipher	Master_SSL_Key	Seconds_Behind_Master
 #	127.0.0.1	root	MASTER_MYPORT	1	master-bin.000001	18911	#	#	master-bin.000001	Yes	Yes							0		0	18911	#	None		0	No						#
-drop table t1,t2;
+drop table t1,t2,t3,t4;

mysql-test/t/rpl_deadlock.test

@@ -107,5 +107,5 @@ select * from t2;
 show slave status;
 
 connection master;
-drop table t1,t2;
+drop table t1,t2,t3,t4;
 sync_slave_with_master;