diff options
| author | Sergei Golubchik <sergii@pisem.net> | 2012-03-09 08:06:59 +0100 |
|---|---|---|
| committer | Sergei Golubchik <sergii@pisem.net> | 2012-03-09 08:06:59 +0100 |
| commit | 4933d21e5d93840ddcf41bf25ed92fbe253ae92d (patch) | |
| tree | a4d892b86aa46927978f82976fff61f1e5193383 /sql/rpl_mi.h | |
| parent | 97ee59d27d3daca806fdb3577df5a0e0a45a0a30 (diff) | |
| parent | 7009bf411a8cb9a6e035b761b5e6352b4f474303 (diff) | |
| download | mariadb-git-4933d21e5d93840ddcf41bf25ed92fbe253ae92d.tar.gz | |
merge with mysql-5.5.21
Diffstat (limited to 'sql/rpl_mi.h')
| -rw-r--r-- | sql/rpl_mi.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sql/rpl_mi.h b/sql/rpl_mi.h index 5875290fa02..c98f7253b18 100644 --- a/sql/rpl_mi.h +++ b/sql/rpl_mi.h @@ -79,8 +79,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 */ |