summaryrefslogtreecommitdiff
path: root/sql/rpl_mi.h
diff options
context:
space:
mode:
authorunknown <chuck.bell@oracle.com>2012-01-30 10:23:21 -0500
committerunknown <chuck.bell@oracle.com>2012-01-30 10:23:21 -0500
commit7009bf411a8cb9a6e035b761b5e6352b4f474303 (patch)
tree9a7f9e1c893fd7ee514374eec7e411810d5f2151 /sql/rpl_mi.h
parent461e039a07062f05082175edb1156725ac43b4c6 (diff)
parent40bab62acff37c947e5d57203235ac0a6afc5f31 (diff)
downloadmariadb-git-7009bf411a8cb9a6e035b761b5e6352b4f474303.tar.gz
Merge with main for BUG#12969301
Diffstat (limited to 'sql/rpl_mi.h')
-rw-r--r--sql/rpl_mi.h4
1 files changed, 2 insertions, 2 deletions
diff --git a/sql/rpl_mi.h b/sql/rpl_mi.h
index 1434ba45519..690b7e76542 100644
--- a/sql/rpl_mi.h
+++ b/sql/rpl_mi.h
@@ -78,8 +78,8 @@ class Master_info : public Slave_reporting_capability
File fd; // we keep the file open, so we need to remember the file pointer
IO_CACHE file;
- mysql_mutex_t data_lock, run_lock;
- mysql_cond_t data_cond, start_cond, stop_cond;
+ mysql_mutex_t data_lock, run_lock, sleep_lock;
+ mysql_cond_t data_cond, start_cond, stop_cond, sleep_cond;
THD *io_thd;
MYSQL* mysql;
uint32 file_id; /* for 3.23 load data infile */