diff options
| author | unknown <monty@hundin.mysql.fi> | 2001-11-28 14:52:11 +0200 |
|---|---|---|
| committer | unknown <monty@hundin.mysql.fi> | 2001-11-28 14:52:11 +0200 |
| commit | b631ea0188d5fb4768732eccb4c5024276b34c9b (patch) | |
| tree | b5ae91cc685e7d8ed845e9ecbcd94e7f8857ea7f /sql/slave.cc | |
| parent | 38da1f9853ec773e6c32cdf931b1fafef2736995 (diff) | |
| parent | 8c335b8a21056c83f771cef8b9d3b551682a50ba (diff) | |
| download | mariadb-git-b631ea0188d5fb4768732eccb4c5024276b34c9b.tar.gz | |
merge
Docs/manual.texi:
Auto merged
mysql-test/t/rpl000013.test:
Auto merged
mysql-test/t/rpl000016.test:
Auto merged
extra/resolveip.c:
Auto merged
sql/sql_base.cc:
Auto merged
sql/sql_insert.cc:
Auto merged
sql/slave.cc:
Auto merged
sql/sql_select.cc:
Auto merged
Diffstat (limited to 'sql/slave.cc')
| -rw-r--r-- | sql/slave.cc | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/sql/slave.cc b/sql/slave.cc index d6f0809c277..700838d7cd7 100644 --- a/sql/slave.cc +++ b/sql/slave.cc @@ -1013,7 +1013,12 @@ static int exec_event(THD* thd, NET* net, MASTER_INFO* mi, int event_len) mi->inc_pos(event_len, ev->log_seq); flush_master_info(mi); - if(slave_skip_counter) + if(slave_skip_counter && /* protect against common user error of + setting the counter to 1 instead of 2 + while recovering from an failed + auto-increment insert */ + !(type_code == INTVAR_EVENT && + slave_skip_counter == 1)) --slave_skip_counter; delete ev; return 0; // avoid infinite update loops |