diff options
| author | unknown <monty@donna.mysql.com> | 2001-02-15 03:43:38 +0200 |
|---|---|---|
| committer | unknown <monty@donna.mysql.com> | 2001-02-15 03:43:38 +0200 |
| commit | dcd26ca7b9c5fc237c051045573dd8fd16163297 (patch) | |
| tree | 76601002047abcc215c8a44e36be30e66a3005b7 /sql | |
| parent | c1488c7e5896920e5f66e28de38964ae9b5ff22e (diff) | |
| parent | 0a4ce964b49214ce0acf9353bf58d9c7380eb83d (diff) | |
| download | mariadb-git-dcd26ca7b9c5fc237c051045573dd8fd16163297.tar.gz | |
Merge work:/my/mysql into donna.mysql.com:/home/my/bk/mysql
Docs/manual.texi:
Auto merged
mysql-test/r/fulltext.result:
Auto merged
sql/slave.cc:
Auto merged
Diffstat (limited to 'sql')
| -rw-r--r-- | sql/slave.cc | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/sql/slave.cc b/sql/slave.cc index e704f471781..f0e4236c29d 100644 --- a/sql/slave.cc +++ b/sql/slave.cc @@ -849,7 +849,8 @@ static int exec_event(THD* thd, NET* net, MASTER_INFO* mi, int event_len) mi->inc_pos(event_len); flush_master_info(mi); - --slave_skip_counter; + if(slave_skip_counter) + --slave_skip_counter; delete ev; return 0; // avoid infinite update loops } |