diff options
| author | Sergei Golubchik <serg@mariadb.org> | 2014-10-08 18:47:16 +0200 |
|---|---|---|
| committer | Sergei Golubchik <serg@mariadb.org> | 2014-10-10 22:27:36 +0200 |
| commit | 03ec3511a82e90310c850ea71b395b214cab1645 (patch) | |
| tree | 65e6b3dea94e4744b5b9a3bfb0f847977ed7d55a /mysys | |
| parent | 8596b70f96fc543c2e1cac4bc8cbe58dcc4004e5 (diff) | |
| download | mariadb-git-03ec3511a82e90310c850ea71b395b214cab1645.tar.gz | |
cleanup: galera misc cleanups
also disable galera-specific output in mysql_tzinfo_to_sql,
it'll be enabled later.
Diffstat (limited to 'mysys')
| -rw-r--r-- | mysys/my_static.c | 4 | ||||
| -rw-r--r-- | mysys/mysys_priv.h | 2 | ||||
| -rw-r--r-- | mysys/thr_lock.c | 8 |
3 files changed, 4 insertions, 10 deletions
diff --git a/mysys/my_static.c b/mysys/my_static.c index 4c977837e05..84d2dc64fc6 100644 --- a/mysys/my_static.c +++ b/mysys/my_static.c @@ -68,10 +68,6 @@ uint my_large_page_size= 0; int volatile my_have_got_alarm=0; /* declare variable to reset */ ulong my_time_to_wait_for_lock=2; /* In seconds */ -#ifdef WITH_WSREP -my_bool mysys_wsrep= 0; -#endif - /* from errors.c */ #ifdef SHARED_LIBRARY const char *globerrs[GLOBERRS]; /* my_error_messages is here */ diff --git a/mysys/mysys_priv.h b/mysys/mysys_priv.h index 9b94a5a18ce..4ea6d081107 100644 --- a/mysys/mysys_priv.h +++ b/mysys/mysys_priv.h @@ -62,8 +62,6 @@ extern mysql_mutex_t THR_LOCK_malloc, THR_LOCK_open, THR_LOCK_keycache; extern mysql_mutex_t THR_LOCK_lock, THR_LOCK_net; extern mysql_mutex_t THR_LOCK_charset; -extern my_bool mysys_wsrep; - #include <mysql/psi/mysql_file.h> #ifdef HAVE_PSI_INTERFACE diff --git a/mysys/thr_lock.c b/mysys/thr_lock.c index cd30c30afea..bb16ba92088 100644 --- a/mysys/thr_lock.c +++ b/mysys/thr_lock.c @@ -688,7 +688,7 @@ wsrep_break_lock( THR_LOCK_DATA *data, struct st_lock_list *lock_queue1, struct st_lock_list *wait_queue) { - if (wsrep_on(data->owner->mysql_thd) && + if (wsrep_on && wsrep_on(data->owner->mysql_thd) && wsrep_thd_is_brute_force && wsrep_thd_is_brute_force(data->owner->mysql_thd, TRUE)) { @@ -858,7 +858,7 @@ thr_lock(THR_LOCK_DATA *data, THR_LOCK_INFO *owner, ulong lock_wait_timeout) In the latter case we should yield the lock to the writer. */ #ifdef WITH_WSREP - if (mysys_wsrep && wsrep_break_lock(data, &lock->write, &lock->read_wait)) + if (wsrep_break_lock(data, &lock->write, &lock->read_wait)) { wsrep_lock_inserted= TRUE; } @@ -1006,7 +1006,7 @@ thr_lock(THR_LOCK_DATA *data, THR_LOCK_INFO *owner, ulong lock_wait_timeout) lock->read.data->owner->thread_id, data->type)); } #ifdef WITH_WSREP - if (mysys_wsrep && wsrep_break_lock(data, &lock->write, &lock->write_wait)) + if (wsrep_break_lock(data, &lock->write, &lock->write_wait)) { wsrep_lock_inserted= TRUE; } @@ -1016,7 +1016,7 @@ thr_lock(THR_LOCK_DATA *data, THR_LOCK_INFO *owner, ulong lock_wait_timeout) } /* Can't get lock yet; Wait for it */ #ifdef WITH_WSREP - if (mysys_wsrep && wsrep_lock_inserted && wsrep_on(data->owner->mysql_thd)) + if (wsrep_lock_inserted && wsrep_on(data->owner->mysql_thd)) DBUG_RETURN(wait_for_lock(wait_queue, data, 1, lock_wait_timeout)); #endif result= wait_for_lock(wait_queue, data, 0, lock_wait_timeout); |