diff options
author | Seppo Jaakola <seppo.jaakola@codership.com> | 2013-07-16 12:09:38 +0300 |
---|---|---|
committer | Seppo Jaakola <seppo.jaakola@codership.com> | 2013-07-16 12:09:38 +0300 |
commit | 81739d308fee0317e56bd70d97e3429ece83dd4b (patch) | |
tree | dcd416d2af5e3fbea030443decf16782efb6f1ba /sql | |
parent | db0cfba638383569b1e30765e2d36e0707bfb930 (diff) | |
download | mariadb-git-81739d308fee0317e56bd70d97e3429ece83dd4b.tar.gz |
Initial fixes after mariadb 10 merge, basic replication works now
Diffstat (limited to 'sql')
-rw-r--r-- | sql/sql_parse.cc | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/sql/sql_parse.cc b/sql/sql_parse.cc index 8dc07ee36e8..ebb189e7762 100644 --- a/sql/sql_parse.cc +++ b/sql/sql_parse.cc @@ -8771,6 +8771,15 @@ wsrep_status_t wsrep_commit_cb(void* const ctx, Relay_log_info* wsrep_relay_log_init(const char* log_fname) { Relay_log_info* rli= new Relay_log_info(false); + LEX_STRING conn = {"wsrep",5}; + + /* + * problem is that mariaDB requires master info for rli, and wsrep replication + * really should not have it. Allocating empty mi here just for the sake of + * getting rpl_filter pointer initialized for mi, rpl_filter will be needed in + * several places + */ + rli->mi= new Master_info(&conn, false); rli->no_storage= true; if (!rli->relay_log.description_event_for_exec) |