diff options
| author | Oleksandr Byelkin <sanja@mariadb.com> | 2018-07-25 22:24:40 +0200 |
|---|---|---|
| committer | Oleksandr Byelkin <sanja@mariadb.com> | 2018-07-25 22:24:40 +0200 |
| commit | cb5952b5060d089c021808fe1f1cf13f7eb88423 (patch) | |
| tree | 1e4678bd3b899428428b4f7980b92fade8e57f62 /sql/tztime.cc | |
| parent | 57cde8ccd19675dc98e3cbacf0ef5c72cb188e49 (diff) | |
| parent | 9fbe360e9f7d41d169eb5abed22dc15f26f6c749 (diff) | |
| download | mariadb-git-cb5952b5060d089c021808fe1f1cf13f7eb88423.tar.gz | |
Merge branch '10.0' into bb-10.1-merge-sanja
Diffstat (limited to 'sql/tztime.cc')
| -rw-r--r-- | sql/tztime.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sql/tztime.cc b/sql/tztime.cc index 7df2ad7d0e8..279d5990460 100644 --- a/sql/tztime.cc +++ b/sql/tztime.cc @@ -1661,7 +1661,7 @@ my_tz_init(THD *org_thd, const char *default_tzname, my_bool bootstrap) { /* If we are in bootstrap mode we should not load time zone tables */ return_val= time_zone_tables_exist= 0; - goto end_with_setting_default_tz; + goto end_with_cleanup; } /* |