diff options
| author | Nirbhay Choubey <nirbhay@skysql.com> | 2014-06-19 21:55:19 -0400 |
|---|---|---|
| committer | Nirbhay Choubey <nirbhay@skysql.com> | 2014-06-19 21:55:19 -0400 |
| commit | 02034e4218836304e81a10523c737b3b25e3ad9c (patch) | |
| tree | 1a8531026bbaab130926ff9f44cbacbac63b25a7 | |
| parent | 97779a2ef05d2141d2ade2f72f0900dbd9960751 (diff) | |
| download | mariadb-git-02034e4218836304e81a10523c737b3b25e3ad9c.tar.gz | |
Merging fix for MDEV#6296 from maria-5.5-galera.
| -rw-r--r-- | sql/wsrep_var.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sql/wsrep_var.cc b/sql/wsrep_var.cc index d187c7b9e35..37e59763249 100644 --- a/sql/wsrep_var.cc +++ b/sql/wsrep_var.cc @@ -453,7 +453,7 @@ void wsrep_node_address_init (const char* value) bool wsrep_slave_threads_check (sys_var *self, THD* thd, set_var* var) { mysql_mutex_lock(&LOCK_wsrep_slave_threads); - wsrep_slave_count_change = var->value->val_int() - wsrep_slave_threads; + wsrep_slave_count_change += (var->value->val_int() - wsrep_slave_threads); mysql_mutex_unlock(&LOCK_wsrep_slave_threads); return 0; |