Commit be22eacb authored by unknown's avatar unknown
Browse files

Merge mysql.com:/Users/emurphy/src/bk-clean/mysql-4.1

into  mysql.com:/Users/emurphy/src/bk-clean/mysql-5.0

parents 1f018422 357ebcc2
Loading
Loading
Loading
Loading
+5 −5
Original line number Diff line number Diff line
@@ -25,9 +25,9 @@ Master_User rpl
Master_Port	MASTER_MYPORT
Connect_Retry	1
Master_Log_File	master-bin.000001
Read_Master_Log_Pos	357
Relay_Log_File	slave-relay-bin.000001
Relay_Log_Pos	401
Read_Master_Log_Pos	#
Relay_Log_File	#
Relay_Log_Pos	#
Relay_Master_Log_File	master-bin.000001
Slave_IO_Running	No
Slave_SQL_Running	Yes
@@ -40,8 +40,8 @@ Replicate_Wild_Ignore_Table
Last_Errno	0
Last_Error	
Skip_Counter	0
Exec_Master_Log_Pos	357
Relay_Log_Space	401
Exec_Master_Log_Pos	#
Relay_Log_Space	#
Until_Condition	None
Until_Log_File	
Until_Log_Pos	0