Merge quant.(none):/ext/mysql/bk/mysql-5.0-rpl-warnings

into quant.(none):/ext/mysql/bkroot/mysql-5.0-rpl

Merge quant.(none):/ext/mysql/bk/mysql-5.0-rpl-warnings
into quant.(none):/ext/mysql/bkroot/mysql-5.0-rpl
c0e985cd · rafal@quant.(none) · c75a0d6a · 536d857d · c0e985cd · c0e985cd
Commit c0e985cd authored Mar 01, 2007 by rafal@quant.(none)
Hide whitespace changes
Inline Side-by-side

Showing with 4 additions and 0 deletions

sql/slave.cc sql/slave.cc +2 -0

sql/sql_repl.cc sql/sql_repl.cc +2 -0

No files found.
--- a/sql/slave.cc
+++ b/sql/slave.cc
@@ -52,7 +52,9 @@ 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;


--- a/sql/sql_repl.cc
+++ b/sql/sql_repl.cc
@@ -22,7 +22,9 @@

 int max_binlog_dump_events = 0; // unlimited
 my_bool opt_sporadic_binlog_dump_fail = 0;
+#ifndef DBUG_OFF
 static int binlog_dump_count = 0;
+#endif

 /*
    fake_rotate_event() builds a fake (=which does not exist physically in any