diff options
| author | He Zhenxing <zhenxing.he@sun.com> | 2009-10-03 18:50:25 +0800 |
|---|---|---|
| committer | He Zhenxing <zhenxing.he@sun.com> | 2009-10-03 18:50:25 +0800 |
| commit | f108d05932d6d565d98c18e5e01b9593f5ace684 (patch) | |
| tree | 725dde87ce3a26584ba62f57b48424b2e0dd1a08 /sql/mysqld.cc | |
| parent | a8c14d9e0e078ac1092a325de2f1b46c881adc4d (diff) | |
| parent | d8724a4538a61ea6f98fb770c951b89bde734f77 (diff) | |
| download | mariadb-git-f108d05932d6d565d98c18e5e01b9593f5ace684.tar.gz | |
Manual merge semi-sync to 5.1-rep+2
Diffstat (limited to 'sql/mysqld.cc')
| -rw-r--r-- | sql/mysqld.cc | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/sql/mysqld.cc b/sql/mysqld.cc index e7c41399fe6..80bd6b7b48c 100644 --- a/sql/mysqld.cc +++ b/sql/mysqld.cc @@ -31,6 +31,8 @@ #include "rpl_injector.h" +#include "rpl_handler.h" + #ifdef HAVE_SYS_PRCTL_H #include <sys/prctl.h> #endif @@ -1287,6 +1289,7 @@ void clean_up(bool print_message) ha_end(); if (tc_log) tc_log->close(); + delegates_destroy(); xid_cache_free(); delete_elements(&key_caches, (void (*)(const char*, uchar*)) free_key_cache); multi_keycache_free(); @@ -3764,6 +3767,13 @@ static int init_server_components() unireg_abort(1); } + /* initialize delegates for extension observers */ + if (delegates_init()) + { + sql_print_error("Initialize extension delegates failed"); + unireg_abort(1); + } + /* need to configure logging before initializing storage engines */ if (opt_update_log) { |