summaryrefslogtreecommitdiff
path: root/sql/slave.h
diff options
context:
space:
mode:
authorunknown <sasha@mysql.sashanet.com>2001-07-07 15:35:23 -0600
committerunknown <sasha@mysql.sashanet.com>2001-07-07 15:35:23 -0600
commit8aac0529c78052e90b6cf2fed36cc9d107796654 (patch)
tree2c2c91a54c739acfc0a214de49f4a8488c3a2894 /sql/slave.h
parent5d63584e60c21c319b2b54292b71e5f9eff76c6e (diff)
parentcb696ba1f3f7d64dbedd64487c7d02660251f98f (diff)
downloadmariadb-git-8aac0529c78052e90b6cf2fed36cc9d107796654.tar.gz
merged latest changes in 3.23
sql/slave.h: Auto merged sql/slave.cc: Auto merged Docs/manual.texi: merged sql/sql_base.cc: merged sql/sql_show.cc: merged
Diffstat (limited to 'sql/slave.h')
-rw-r--r--sql/slave.h3
1 files changed, 1 insertions, 2 deletions
diff --git a/sql/slave.h b/sql/slave.h
index d9131bb53be..eab73157799 100644
--- a/sql/slave.h
+++ b/sql/slave.h
@@ -98,8 +98,7 @@ int init_master_info(MASTER_INFO* mi);
void end_master_info(MASTER_INFO* mi);
extern bool opt_log_slave_updates ;
pthread_handler_decl(handle_slave,arg);
-extern bool volatile abort_loop, abort_slave;
-extern bool slave_running;
+extern bool volatile abort_loop, abort_slave, slave_running;
extern uint32 slave_skip_counter;
// needed for problems when slave stops and
// we want to restart it skipping one or more events in the master log that