diff options
| author | unknown <monty@hundin.mysql.fi> | 2002-06-02 17:05:08 +0300 |
|---|---|---|
| committer | unknown <monty@hundin.mysql.fi> | 2002-06-02 17:05:08 +0300 |
| commit | 0e5f0023b3405449c8e3371cb67989f1c1fbb3f7 (patch) | |
| tree | ccdf6d71295fb66bed1a352fc14d1ca854a0d6bd /sql/slave.cc | |
| parent | 499ebe5459e655ede75f0d9c30608dd704e637a9 (diff) | |
| parent | 78aa48a809319ffdc0367f02908a2fcf92f19fbb (diff) | |
| download | mariadb-git-0e5f0023b3405449c8e3371cb67989f1c1fbb3f7.tar.gz | |
Merge work:/home/bk/mysql-4.0 into hundin.mysql.fi:/my/bk/mysql-4.0
client/mysqltest.c:
Auto merged
sql/mysqld.cc:
Auto merged
sql/slave.cc:
Auto merged
Diffstat (limited to 'sql/slave.cc')
| -rw-r--r-- | sql/slave.cc | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/sql/slave.cc b/sql/slave.cc index 19e093a75d2..93e711f2e14 100644 --- a/sql/slave.cc +++ b/sql/slave.cc @@ -48,12 +48,10 @@ ulong relay_log_space_limit = 0; /* TODO: fix variables to access ulonglong // can re-use them on slave start // TODO: move the vars below under MASTER_INFO -#ifndef DBUG_OFF int disconnect_slave_event_count = 0, abort_slave_event_count = 0; static int events_till_disconnect = -1; int events_till_abort = -1; static int stuck_count = 0; -#endif typedef enum { SLAVE_THD_IO, SLAVE_THD_SQL} SLAVE_THD_TYPE; |