Fixed a bug in make test, non-debug version.
sql/slave.cc: Released some variables in non-debug version. These are needed in mysqld.cc my_getopt struct, which defines some options, which are used by mysql_test in a non-debug version. sql/sql_repl.cc: Released some variables in non-debug version. These are needed in mysqld.cc my_getopt struct, which defines some options, which are used by mysql_test in a non-debug version.
This commit is contained in:
parent
a90b2f309e
commit
75d312bc1f
@ -48,12 +48,10 @@ ulong relay_log_space_limit = 0; /* TODO: fix variables to access ulonglong
|
|||||||
// can re-use them on slave start
|
// can re-use them on slave start
|
||||||
|
|
||||||
// TODO: move the vars below under MASTER_INFO
|
// TODO: move the vars below under MASTER_INFO
|
||||||
#ifndef DBUG_OFF
|
|
||||||
int disconnect_slave_event_count = 0, abort_slave_event_count = 0;
|
int disconnect_slave_event_count = 0, abort_slave_event_count = 0;
|
||||||
static int events_till_disconnect = -1;
|
static int events_till_disconnect = -1;
|
||||||
int events_till_abort = -1;
|
int events_till_abort = -1;
|
||||||
static int stuck_count = 0;
|
static int stuck_count = 0;
|
||||||
#endif
|
|
||||||
|
|
||||||
typedef enum { SLAVE_THD_IO, SLAVE_THD_SQL} SLAVE_THD_TYPE;
|
typedef enum { SLAVE_THD_IO, SLAVE_THD_SQL} SLAVE_THD_TYPE;
|
||||||
|
|
||||||
|
@ -27,11 +27,9 @@
|
|||||||
|
|
||||||
extern const char* any_db;
|
extern const char* any_db;
|
||||||
|
|
||||||
#ifndef DBUG_OFF
|
|
||||||
int max_binlog_dump_events = 0; // unlimited
|
int max_binlog_dump_events = 0; // unlimited
|
||||||
bool opt_sporadic_binlog_dump_fail = 0;
|
bool opt_sporadic_binlog_dump_fail = 0;
|
||||||
static int binlog_dump_count = 0;
|
static int binlog_dump_count = 0;
|
||||||
#endif
|
|
||||||
|
|
||||||
int check_binlog_magic(IO_CACHE* log, const char** errmsg)
|
int check_binlog_magic(IO_CACHE* log, const char** errmsg)
|
||||||
{
|
{
|
||||||
|
Loading…
x
Reference in New Issue
Block a user