diff options
| author | Nirbhay Choubey <nirbhay@mariadb.com> | 2015-03-28 17:29:10 -0400 |
|---|---|---|
| committer | Nirbhay Choubey <nirbhay@mariadb.com> | 2015-03-28 17:29:10 -0400 |
| commit | 84a4db263a1d98e9a2f3c6b5816a9b6b9a019128 (patch) | |
| tree | 34e88fe5c34eef90f550fe96aec38934ac00fc55 /sql/wsrep_mysqld.cc | |
| parent | 555915faa9fc5ec0a7df09b51716be027120fa8c (diff) | |
| parent | d7445ea6dfbd3be390792c636f755d3bb40d5fbf (diff) | |
| download | mariadb-git-84a4db263a1d98e9a2f3c6b5816a9b6b9a019128.tar.gz | |
Merge branch '5.5-galera' into 10.0-galera
Diffstat (limited to 'sql/wsrep_mysqld.cc')
| -rw-r--r-- | sql/wsrep_mysqld.cc | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/sql/wsrep_mysqld.cc b/sql/wsrep_mysqld.cc index c5036d5e83a..9ac688953fe 100644 --- a/sql/wsrep_mysqld.cc +++ b/sql/wsrep_mysqld.cc @@ -738,6 +738,7 @@ void wsrep_deinit(bool free_options) provider_name[0]= '\0'; provider_version[0]= '\0'; provider_vendor[0]= '\0'; + wsrep_inited= 0; if (free_options) @@ -1134,6 +1135,11 @@ int wsrep_to_buf_helper( return 1; int ret(0); + Format_description_log_event *tmp_fd= new Format_description_log_event(4); + tmp_fd->checksum_alg= binlog_checksum_options; + tmp_fd->write(&tmp_io_cache); + delete tmp_fd; + #ifdef GTID_SUPPORT if (thd->variables.gtid_next.type == GTID_GROUP) { |