diff options
| author | Sergei Golubchik <serg@mariadb.org> | 2015-02-06 16:14:23 +0100 |
|---|---|---|
| committer | Sergei Golubchik <serg@mariadb.org> | 2015-02-06 16:14:23 +0100 |
| commit | 8e7649867f23ef4fca5ddb6678a66e414026ef7b (patch) | |
| tree | ff7649743a3bf13ea13eb80f1126a13cd756d335 /sql/rpl_mi.cc | |
| parent | f9448bcb2153aac614ecb260a4dd7f27b04f17a2 (diff) | |
| parent | 7cda4bee0ef7c8a3ec85e94bc1443ceaba3a64e8 (diff) | |
| download | mariadb-git-8e7649867f23ef4fca5ddb6678a66e414026ef7b.tar.gz | |
Merge 10.0-galera into 10.1
Diffstat (limited to 'sql/rpl_mi.cc')
| -rw-r--r-- | sql/rpl_mi.cc | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/sql/rpl_mi.cc b/sql/rpl_mi.cc index e97b5ecc8fe..8ce67bbf4b8 100644 --- a/sql/rpl_mi.cc +++ b/sql/rpl_mi.cc @@ -92,6 +92,13 @@ Master_info::Master_info(LEX_STRING *connection_name_arg, Master_info::~Master_info() { +#ifdef WITH_WSREP + /* + Do not free "wsrep" rpl_filter. It will eventually be freed by + free_all_rpl_filters() when server terminates. + */ + if (strncmp(connection_name.str, STRING_WITH_LEN("wsrep"))) +#endif rpl_filters.delete_element(connection_name.str, connection_name.length, (void (*)(const char*, uchar*)) free_rpl_filter); my_free(connection_name.str); |