database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-08-08 11:22:35 +03:00
Code Activity

merge with mysql-5.5.21

Browse Source
This commit is contained in:
Sergei Golubchik
2012-03-09 08:06:59 +01:00
parent 97ee59d27d 7009bf411a
commit 4933d21e5d
127 changed files with 3500 additions and 1546 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
sql/rpl_mi.h
View File

@@ -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 */