diff options
| author | Shivji Kumar Jha <shivji.jha@oracle.com> | 2012-12-09 17:26:44 +0530 |
|---|---|---|
| committer | Shivji Kumar Jha <shivji.jha@oracle.com> | 2012-12-09 17:26:44 +0530 |
| commit | 07a5b266fb783d741f1fdadb4d28b39da1db3b96 (patch) | |
| tree | c720a7e37fd82dd69a41b7fb941eccb529068fa7 /mysql-test/suite/engines | |
| parent | b74a229c23dd1d67c1f108cfec261e7756c86537 (diff) | |
| parent | 6b3dad83c921981f1df739047136ece74a35409c (diff) | |
| download | mariadb-git-07a5b266fb783d741f1fdadb4d28b39da1db3b96.tar.gz | |
BUG#12359942 - REPLICATION TEST FROM ENGINE SUITE RPL_ROW_UNTIL TIMES OUT
patch to fix post push falures in pb2
bzr merge 5.1->5.5
BUG#15872504 - REMOVE MYSQL-TEST/INCLUDE/GET_BINLOG_DUMP_THREAD_ID.INC
bzr merge 5.1->5.6
Diffstat (limited to 'mysql-test/suite/engines')
| -rw-r--r-- | mysql-test/suite/engines/funcs/r/rpl_row_until.result | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/mysql-test/suite/engines/funcs/r/rpl_row_until.result b/mysql-test/suite/engines/funcs/r/rpl_row_until.result index 7094a40ab3c..5629f5c8cdd 100644 --- a/mysql-test/suite/engines/funcs/r/rpl_row_until.result +++ b/mysql-test/suite/engines/funcs/r/rpl_row_until.result @@ -54,8 +54,7 @@ ERROR HY000: Incorrect parameter or combination of parameters for START SLAVE UN START SLAVE; START SLAVE UNTIL MASTER_LOG_FILE='master-bin.000001', MASTER_LOG_POS=MASTER_LOG_POS; Warnings: -Note 1254 Slave is already running +Note 1254 Slave is already running include/stop_slave.inc RESET SLAVE; include/rpl_end.inc - |