diff options
| author | Monty <monty@mariadb.org> | 2017-10-25 11:07:44 +0300 |
|---|---|---|
| committer | Monty <monty@mariadb.org> | 2017-12-18 13:43:36 +0200 |
| commit | 2e53b96a0aa9dcb18d8bbe12e5bc7e0aba208540 (patch) | |
| tree | 112b522a5ae3a3132266052e38edcdac0a919e1a /sql/rpl_handler.cc | |
| parent | 77030649fb1f492b6dd9351a7d4b36e1aeb29f4d (diff) | |
| download | mariadb-git-2e53b96a0aa9dcb18d8bbe12e5bc7e0aba208540.tar.gz | |
Moved semisync from a plugin to normal server
Part of MDEV-13073 AliSQL Optimize performance of semisync
Did the following renames to match other similar variables
key_ss_mutex_LOCK_binlog_ > key_LOCK_bing
key_ss_cond_COND_binlog_send_ -> key_COND_binlog_send
COND_binlog_send_ -> COND_binlog_send
LOCK_binlog_ -> LOCK_binlog
debian/mariadb-server-10.2.install does not install semisync libs.
Diffstat (limited to 'sql/rpl_handler.cc')
| -rw-r--r-- | sql/rpl_handler.cc | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/sql/rpl_handler.cc b/sql/rpl_handler.cc index e3ff2a17a6a..27e411ca6de 100644 --- a/sql/rpl_handler.cc +++ b/sql/rpl_handler.cc @@ -149,13 +149,17 @@ void delegates_destroy() { if (transaction_delegate) transaction_delegate->~Trans_delegate(); + transaction_delegate= 0; if (binlog_storage_delegate) binlog_storage_delegate->~Binlog_storage_delegate(); + binlog_storage_delegate= 0; #ifdef HAVE_REPLICATION if (binlog_transmit_delegate) binlog_transmit_delegate->~Binlog_transmit_delegate(); + binlog_transmit_delegate= 0; if (binlog_relay_io_delegate) binlog_relay_io_delegate->~Binlog_relay_IO_delegate(); + binlog_relay_io_delegate= 0; #endif /* HAVE_REPLICATION */ } @@ -171,13 +175,11 @@ void delegates_destroy() Observer_info *info= iter++; \ for (; info; info= iter++) \ { \ - if (do_lock) plugin_lock(thd, plugin_int_to_ref(info->plugin_int)); \ if (((Observer *)info->observer)->f \ && ((Observer *)info->observer)->f args) \ { \ r= 1; \ - sql_print_error("Run function '" #f "' in plugin '%s' failed", \ - info->plugin_int->name.str); \ + sql_print_error("Run function '" #f "' failed"); \ break; \ } \ } \ |