Skip to content

M
mariadb
Commit be22eacb authored by unknown's avatar unknown
Browse files
Options

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
Hide whitespace changes
Inline Side-by-side
Showing with 5 additions and 5 deletions
mysql-test/r/rpl_slave_status.result
View file @ be22eacb
...@@ -25,9 +25,9 @@ Master_User rpl ...@@ -25,9 +25,9 @@ Master_User rpl
Master_Port MASTER_MYPORT Master_Port MASTER_MYPORT
Connect_Retry 1 Connect_Retry 1
Master_Log_File master-bin.000001 Master_Log_File master-bin.000001
Read_Master_Log_Pos 357 Read_Master_Log_Pos #
Relay_Log_File slave-relay-bin.000001 Relay_Log_File #
Relay_Log_Pos 401 Relay_Log_Pos #
Relay_Master_Log_File master-bin.000001 Relay_Master_Log_File master-bin.000001
Slave_IO_Running No Slave_IO_Running No
Slave_SQL_Running Yes Slave_SQL_Running Yes
...@@ -40,8 +40,8 @@ Replicate_Wild_Ignore_Table ...@@ -40,8 +40,8 @@ Replicate_Wild_Ignore_Table
Last_Errno 0 Last_Errno 0
Last_Error Last_Error
Skip_Counter 0 Skip_Counter 0
Exec_Master_Log_Pos 357 Exec_Master_Log_Pos #
Relay_Log_Space 401 Relay_Log_Space #
Until_Condition None Until_Condition None
Until_Log_File Until_Log_File
Until_Log_Pos 0 Until_Log_Pos 0
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7