diff options
| author | Sergei Golubchik <sergii@pisem.net> | 2011-10-19 21:53:14 +0200 |
|---|---|---|
| committer | Sergei Golubchik <sergii@pisem.net> | 2011-10-19 21:53:14 +0200 |
| commit | 86a2d707794b075701f3ac5e565fc5c7e7fccfe2 (patch) | |
| tree | 3538a24ed306fc91ed1b1d0b5af8e1ba8b8dfc90 /sql/rpl_mi.cc | |
| parent | 957b559039ac6ab6d2af08dd271f789f6207a0b5 (diff) | |
| download | mariadb-git-86a2d707794b075701f3ac5e565fc5c7e7fccfe2.tar.gz | |
safe_mutex deadlock detector post-merge fixes
Diffstat (limited to 'sql/rpl_mi.cc')
| -rw-r--r-- | sql/rpl_mi.cc | 10 |
1 files changed, 2 insertions, 8 deletions
diff --git a/sql/rpl_mi.cc b/sql/rpl_mi.cc index 705d3a8e450..f491db25048 100644 --- a/sql/rpl_mi.cc +++ b/sql/rpl_mi.cc @@ -41,17 +41,11 @@ Master_info::Master_info(bool is_slave_recovery) bzero((char*) &file, sizeof(file)); mysql_mutex_init(key_master_info_run_lock, &run_lock, MY_MUTEX_INIT_FAST); mysql_mutex_init(key_master_info_data_lock, &data_lock, MY_MUTEX_INIT_FAST); + mysql_mutex_setflags(&run_lock, MYF_NO_DEADLOCK_DETECTION); + mysql_mutex_setflags(&data_lock, MYF_NO_DEADLOCK_DETECTION); mysql_cond_init(key_master_info_data_cond, &data_cond, NULL); mysql_cond_init(key_master_info_start_cond, &start_cond, NULL); mysql_cond_init(key_master_info_stop_cond, &stop_cond, NULL); - -#ifdef SAFE_MUTEX - /* Define mutex order for locks to find wrong lock usage */ - mysql_mutex_lock(&data_lock); - mysql_mutex_lock(&run_lock); - mysql_mutex_unlock(&run_lock); - mysql_mutex_unlock(&data_lock); -#endif } Master_info::~Master_info() |