diff options
| author | Martin Hansson <mhansson@mysql.com> | 2009-05-13 17:24:27 +0200 |
|---|---|---|
| committer | Martin Hansson <mhansson@mysql.com> | 2009-05-13 17:24:27 +0200 |
| commit | 5811a1371279b66a66478a0b475f33a9ece03e33 (patch) | |
| tree | 65bb2b607b8c862aadc7184985386128d31652dd /mysql-test/suite/rpl | |
| parent | bd59628754d7f6ced2c19286c041b1ee5ce354e0 (diff) | |
| parent | 391364fac778621e626c9ffdf7653d2b61690ad3 (diff) | |
| download | mariadb-git-5811a1371279b66a66478a0b475f33a9ece03e33.tar.gz | |
Merge.
Diffstat (limited to 'mysql-test/suite/rpl')
| -rw-r--r-- | mysql-test/suite/rpl/r/rpl_slave_skip.result | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/mysql-test/suite/rpl/r/rpl_slave_skip.result b/mysql-test/suite/rpl/r/rpl_slave_skip.result index 747e8f235a8..93b3e124a01 100644 --- a/mysql-test/suite/rpl/r/rpl_slave_skip.result +++ b/mysql-test/suite/rpl/r/rpl_slave_skip.result @@ -39,8 +39,8 @@ a b SELECT * FROM t2; c d 1 2 -2 16 -3 54 +2 8 +3 18 **** On Slave **** START SLAVE UNTIL MASTER_LOG_FILE='master-bin.000001', MASTER_LOG_POS=762; SHOW SLAVE STATUS; @@ -50,7 +50,7 @@ Master_User root Master_Port MASTER_PORT Connect_Retry 1 Master_Log_File master-bin.000001 -Read_Master_Log_Pos 1133 +Read_Master_Log_Pos 1115 Relay_Log_File # Relay_Log_Pos # Relay_Master_Log_File master-bin.000001 |