diff options
| author | Sergei Golubchik <sergii@pisem.net> | 2012-05-21 20:54:41 +0200 |
|---|---|---|
| committer | Sergei Golubchik <sergii@pisem.net> | 2012-05-21 20:54:41 +0200 |
| commit | 1185420da0964b2f06d9fd91bd02d067b0a359de (patch) | |
| tree | 0b4162e316a18fa6ce3f56ee447454b4c73d1805 /sql/sql_reload.cc | |
| parent | 431e042b5d76ed5fd219c39db798c9e7478731c8 (diff) | |
| parent | 7f6f53a8df10c76f93848c8d06bc5af71051c525 (diff) | |
| download | mariadb-git-1185420da0964b2f06d9fd91bd02d067b0a359de.tar.gz | |
5.3 merge
Diffstat (limited to 'sql/sql_reload.cc')
| -rw-r--r-- | sql/sql_reload.cc | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/sql/sql_reload.cc b/sql/sql_reload.cc index 1f3b1effff3..914b9026014 100644 --- a/sql/sql_reload.cc +++ b/sql/sql_reload.cc @@ -24,6 +24,7 @@ #include "sql_db.h" // my_dbopt_cleanup #include "hostname.h" // hostname_cache_refresh #include "sql_repl.h" // reset_master, reset_slave +#include "rpl_mi.h" // Master_info::data_lock #include "debug_sync.h" static void disable_checkpoints(THD *thd); @@ -156,10 +157,10 @@ bool reload_acl_and_cache(THD *thd, unsigned long options, if (options & REFRESH_RELAY_LOG) { #ifdef HAVE_REPLICATION - mysql_mutex_lock(&LOCK_active_mi); + mysql_mutex_lock(&active_mi->data_lock); if (rotate_relay_log(active_mi)) *write_to_binlog= -1; - mysql_mutex_unlock(&LOCK_active_mi); + mysql_mutex_unlock(&active_mi->data_lock); #endif } #ifdef HAVE_QUERY_CACHE |