diff options
| author | Sergei Golubchik <serg@mariadb.org> | 2014-10-08 18:47:16 +0200 |
|---|---|---|
| committer | Sergei Golubchik <serg@mariadb.org> | 2014-10-10 22:27:36 +0200 |
| commit | 03ec3511a82e90310c850ea71b395b214cab1645 (patch) | |
| tree | 65e6b3dea94e4744b5b9a3bfb0f847977ed7d55a /sql/tztime.cc | |
| parent | 8596b70f96fc543c2e1cac4bc8cbe58dcc4004e5 (diff) | |
| download | mariadb-git-03ec3511a82e90310c850ea71b395b214cab1645.tar.gz | |
cleanup: galera misc cleanups
also disable galera-specific output in mysql_tzinfo_to_sql,
it'll be enabled later.
Diffstat (limited to 'sql/tztime.cc')
| -rw-r--r-- | sql/tztime.cc | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/sql/tztime.cc b/sql/tztime.cc index 577474cd78f..24e61588a06 100644 --- a/sql/tztime.cc +++ b/sql/tztime.cc @@ -2709,11 +2709,11 @@ main(int argc, char **argv) return 1; } -#ifdef WITH_WSREP // Replicate MyISAM DDL for this session, cf. lp:1161432 // timezone info unfixable in XtraDB Cluster - printf("SET GLOBAL wsrep_replicate_myisam= ON;\n"); -#endif /* WITH_WSREP */ + printf("set @prep=if((select count(*) from information_schema.global_variables where variable_name='wsrep_on'), 'SET GLOBAL wsrep_replicate_myisam=?', 'do ?');\n" + "prepare set_wsrep_myisam from @prep;\n" + "set @toggle=1; execute set_wsrep_myisam using @toggle;\n"); if (argc == 1 && !opt_leap) { @@ -2762,10 +2762,8 @@ 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 */ + printf("set @toggle=0; execute set_wsrep_myisam using @toggle;\n"); free_defaults(default_argv); my_end(0); |