diff options
| author | Shivji Kumar Jha <shivji.jha@oracle.com> | 2012-12-05 10:24:45 +0530 |
|---|---|---|
| committer | Shivji Kumar Jha <shivji.jha@oracle.com> | 2012-12-05 10:24:45 +0530 |
| commit | 611b3c46d4136849ab795f489f9055fde57cfe4d (patch) | |
| tree | 462cfc4717f2ce9cc450baf2b5d25810ddf80a2b /sql/sql_repl.cc | |
| parent | ee94a9cac48090d8d0175947ca8a7f8a237e21eb (diff) | |
| parent | 3ed7eb3aeda0d862e67b59058d32a06bedce6069 (diff) | |
| download | mariadb-git-611b3c46d4136849ab795f489f9055fde57cfe4d.tar.gz | |
BUG#12359942 - REPLICATION TEST FROM ENGINE SUITE RPL_ROW_UNTIL TIMES OUT
bzr merge 5.1->5.5
Diffstat (limited to 'sql/sql_repl.cc')
| -rw-r--r-- | sql/sql_repl.cc | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/sql/sql_repl.cc b/sql/sql_repl.cc index 16b6a7594eb..e16ce15e512 100644 --- a/sql/sql_repl.cc +++ b/sql/sql_repl.cc @@ -1116,6 +1116,8 @@ int start_slave(THD* thd , Master_info* mi, bool net_report) if (thd->lex->mi.pos) { + if (thd->lex->mi.relay_log_pos) + slave_errno=ER_BAD_SLAVE_UNTIL_COND; mi->rli.until_condition= Relay_log_info::UNTIL_MASTER_POS; mi->rli.until_log_pos= thd->lex->mi.pos; /* @@ -1127,6 +1129,8 @@ int start_slave(THD* thd , Master_info* mi, bool net_report) } else if (thd->lex->mi.relay_log_pos) { + if (thd->lex->mi.pos) + slave_errno=ER_BAD_SLAVE_UNTIL_COND; mi->rli.until_condition= Relay_log_info::UNTIL_RELAY_POS; mi->rli.until_log_pos= thd->lex->mi.relay_log_pos; strmake(mi->rli.until_log_name, thd->lex->mi.relay_log_name, |