diff options
author | Nirbhay Choubey <nirbhay@skysql.com> | 2014-03-28 08:26:08 -0400 |
---|---|---|
committer | Nirbhay Choubey <nirbhay@skysql.com> | 2014-03-28 08:26:08 -0400 |
commit | 9d2e90f379654fb65c0eab006213d772302bcff7 (patch) | |
tree | a9d4a9340cf301c180df704fa4c667840038bfc9 /sql | |
parent | 02ba2bfdb444531e6fe61716a4eaeab40e210bbd (diff) | |
parent | a500865c133251416604255028802b550d6941a8 (diff) | |
download | mariadb-git-9d2e90f379654fb65c0eab006213d772302bcff7.tar.gz |
Merged revision 3471, 3472 & 3473 from maria-5.5-galera.
Diffstat (limited to 'sql')
-rw-r--r-- | sql/handler.cc | 2 | ||||
-rw-r--r-- | sql/mysqld.cc | 4 | ||||
-rw-r--r-- | sql/tztime.cc | 9 |
3 files changed, 13 insertions, 2 deletions
diff --git a/sql/handler.cc b/sql/handler.cc index 9144ab8e92a..af0e1c74b15 100644 --- a/sql/handler.cc +++ b/sql/handler.cc @@ -6218,7 +6218,7 @@ void ha_wsrep_fake_trx_id(THD *thd) } else { - WSREP_WARN("cannot get get fake InnoDB transaction ID"); + WSREP_WARN("cannot get fake InnoDB transaction ID"); } DBUG_VOID_RETURN; diff --git a/sql/mysqld.cc b/sql/mysqld.cc index a0d7b346854..0bd06fd57e7 100644 --- a/sql/mysqld.cc +++ b/sql/mysqld.cc @@ -2055,6 +2055,10 @@ extern "C" void unireg_abort(int exit_code) wsrep_close_threads(thd); /* this won't close all threads */ sleep(1); /* so give some time to exit for those which can */ WSREP_INFO("Some threads may fail to exit."); + + /* In bootstrap mode we deinitialize wsrep here. */ + if (opt_bootstrap && wsrep_inited) + wsrep_deinit(); } #endif // WITH_WSREP clean_up(!opt_abort && (exit_code || !opt_bootstrap)); /* purecov: inspected */ diff --git a/sql/tztime.cc b/sql/tztime.cc index 857039eb1e8..82f26ca4da4 100644 --- a/sql/tztime.cc +++ b/sql/tztime.cc @@ -2709,8 +2709,10 @@ main(int argc, char **argv) return 1; } +#ifdef WITH_WSREP // Replicate MyISAM DDL for this session, cf. lp:1161432 - printf("SET SESSION wsrep_replicate_myisam=ON;\n"); + printf("SET GLOBAL wsrep_replicate_myisam= ON;\n"); +#endif /* WITH_WSREP */ if (argc == 1 && !opt_leap) { @@ -2759,6 +2761,11 @@ main(int argc, char **argv) free_root(&tz_storage, MYF(0)); } +#ifdef WITH_WSREP + // Reset wsrep_replicate_myisam. lp:1161432 + printf("SET GLOBAL wsrep_replicate_myisam= OFF;\n"); +#endif /* WITH_WSREP */ + free_defaults(default_argv); my_end(0); return 0; |