diff options
| author | Sergei Golubchik <sergii@pisem.net> | 2013-02-28 18:42:49 +0100 |
|---|---|---|
| committer | Sergei Golubchik <sergii@pisem.net> | 2013-02-28 18:42:49 +0100 |
| commit | 8161c6772d144d6a4f08fc924ff6e6e403d1371d (patch) | |
| tree | 3f1fe5f8048a163da4eadf0f86c1fd2a3007955d /sql/sql_repl.cc | |
| parent | 154aac8eb002f5d167153e09f1d13570989521e0 (diff) | |
| parent | 31c06437c970d4d0f4ec0301acac9c56e0ed29b5 (diff) | |
| download | mariadb-git-8161c6772d144d6a4f08fc924ff6e6e403d1371d.tar.gz | |
merge with mysql-5.5.30 minus few incorrect or not applicable changesets
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 631825f0527..57820784b8d 100644 --- a/sql/sql_repl.cc +++ b/sql/sql_repl.cc @@ -1262,6 +1262,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; /* @@ -1273,6 +1275,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, |