diff options
| author | unknown <rafal@quant.(none)> | 2007-03-01 16:32:57 +0100 |
|---|---|---|
| committer | unknown <rafal@quant.(none)> | 2007-03-01 16:32:57 +0100 |
| commit | 0b0abf2b66108ea40c59c2f3b2b7a54e239a1b5a (patch) | |
| tree | feb4e21ccb5074a25d0a209690cb631c08cd273c /sql/slave.cc | |
| parent | bf9521d24bd9fd5228d52642fd16abd3830c2d09 (diff) | |
| parent | 17b3cbe81b1b22382198279497c90071499d5b08 (diff) | |
| download | mariadb-git-0b0abf2b66108ea40c59c2f3b2b7a54e239a1b5a.tar.gz | |
Merge rsomla@bk-internal.mysql.com:/home/bk/mysql-5.1-new-rpl
into quant.(none):/ext/mysql/bkroot/mysql-5.1-new-rpl
sql/slave.cc:
Auto merged
Diffstat (limited to 'sql/slave.cc')
| -rw-r--r-- | sql/slave.cc | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/sql/slave.cc b/sql/slave.cc index bede185f4c1..ea8e9e404d4 100644 --- a/sql/slave.cc +++ b/sql/slave.cc @@ -53,6 +53,10 @@ ulonglong relay_log_space_limit = 0; */ int disconnect_slave_event_count = 0, abort_slave_event_count = 0; +int events_till_abort = -1; +#ifndef DBUG_OFF +static int events_till_disconnect = -1; +#endif typedef enum { SLAVE_THD_IO, SLAVE_THD_SQL} SLAVE_THD_TYPE; |