diff options
| author | Shivji Kumar Jha <shivji.jha@oracle.com> | 2013-02-17 01:45:10 +0530 |
|---|---|---|
| committer | Shivji Kumar Jha <shivji.jha@oracle.com> | 2013-02-17 01:45:10 +0530 |
| commit | ae5951d395e4698d54700f65410fffe80dbd74ec (patch) | |
| tree | d0a505eef44663057bd5c3aac153777b238f883d /mysql-test/suite/rpl/r/rpl_row_until.result | |
| parent | 91e043c304065a5786218f343f08c433faf117b5 (diff) | |
| parent | 5fcf40a2aa28850ec84ed26f44aa8258c9f7bf9b (diff) | |
| download | mariadb-git-ae5951d395e4698d54700f65410fffe80dbd74ec.tar.gz | |
BUG#15965353- RPL.RPL_ROW_UNTIL FAILS ON PB2,
PLATFORM= MACOSX10.6 X86_64 MAX
bzr merge 5.1=>5.5
Diffstat (limited to 'mysql-test/suite/rpl/r/rpl_row_until.result')
| -rw-r--r-- | mysql-test/suite/rpl/r/rpl_row_until.result | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/mysql-test/suite/rpl/r/rpl_row_until.result b/mysql-test/suite/rpl/r/rpl_row_until.result index 5629f5c8cdd..26f858c3d56 100644 --- a/mysql-test/suite/rpl/r/rpl_row_until.result +++ b/mysql-test/suite/rpl/r/rpl_row_until.result @@ -27,13 +27,6 @@ n 3 4 include/check_slave_param.inc [Exec_Master_Log_Pos] -START SLAVE UNTIL RELAY_LOG_FILE='slave-relay-bin.000002', RELAY_LOG_POS=relay_pos_insert1_t2 -include/wait_for_slave_sql_to_stop.inc -SELECT * FROM t2; -n -1 -2 -include/check_slave_param.inc [Exec_Master_Log_Pos] START SLAVE; include/wait_for_slave_to_start.inc include/stop_slave.inc @@ -51,10 +44,17 @@ START SLAVE UNTIL RELAY_LOG_FILE='slave-relay-bin.000009'; ERROR HY000: Incorrect parameter or combination of parameters for START SLAVE UNTIL START SLAVE UNTIL RELAY_LOG_FILE='slave-relay-bin.000002', MASTER_LOG_POS=MASTER_LOG_POS; ERROR HY000: Incorrect parameter or combination of parameters for START SLAVE UNTIL -START SLAVE; START SLAVE UNTIL MASTER_LOG_FILE='master-bin.000001', MASTER_LOG_POS=MASTER_LOG_POS; -Warnings: -Note 1254 Slave is already running -include/stop_slave.inc -RESET SLAVE; +include/start_slave.inc +include/rpl_reset.inc +CREATE TABLE t1 (a INT); +INSERT INTO t1 VALUES (1); +include/stop_slave_sql.inc +INSERT INTO t1 VALUES (2); +INSERT INTO t1 VALUES (3); +include/sync_slave_io_with_master.inc +include/wait_for_slave_sql_to_stop.inc +include/assert.inc [table t1 should have two rows.] +include/start_slave.inc +DROP TABLE t1; include/rpl_end.inc |