bk commit into 5.0 tree (konstantin:1.1975) BUG#14077

[konstantin]

Below is the list of changes that have just been committed into a local
5.0 repository of kostja. When kostja 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.1975 05/11/16 13:08:52 konstantin@stripped +2 -0
  Post-merge fixes (Bug#14077)

  mysql-test/t/rpl_sp.test
    1.10 05/11/16 13:08:44 konstantin@stripped +1 -0
    Post-merge fixes.

  mysql-test/r/rpl_sp.result
    1.14 05/11/16 13:08:44 konstantin@stripped +2 -1
    Post-merge fixes.

# 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:	konstantin
# Host:	dragonfly.local
# Root:	/opt/local/work/mysql-5.0-14077

--- 1.13/mysql-test/r/rpl_sp.result	2005-11-15 03:25:00 +03:00
+++ 1.14/mysql-test/r/rpl_sp.result	2005-11-16 13:08:44 +03:00
@@ -398,11 +398,12 @@
 1
 stop slave;
 flush logs;
+reset master;
 reset slave;
 start slave;
 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_PORT	1	master-bin.000003	98	#	#	master-bin.000003	Yes	Yes							0		0	98	#	None		0	No						#
+#	127.0.0.1	root	MASTER_PORT	1	master-bin.000001	210	#	#	master-bin.000001	Yes	Yes							0		0	210	#	None		0	No						#
 select * from t1;
 a
 1

--- 1.9/mysql-test/t/rpl_sp.test	2005-11-15 03:25:00 +03:00
+++ 1.10/mysql-test/t/rpl_sp.test	2005-11-16 13:08:44 +03:00
@@ -401,6 +401,7 @@
 stop slave;
 connection master;
 flush logs;
+reset master;
 save_master_pos;
 system mv -f var/log/master-bin.000001 var/log/master-bin.000002;
 system cp std_data/bug14077log-bin.000001 var/log/master-bin.000001;