summaryrefslogtreecommitdiff
path: root/sql/tztime.cc
diff options
context:
space:
mode:
Diffstat (limited to 'sql/tztime.cc')
-rw-r--r--sql/tztime.cc4
1 files changed, 4 insertions, 0 deletions
diff --git a/sql/tztime.cc b/sql/tztime.cc
index dbed1a16982..0784b73f353 100644
--- a/sql/tztime.cc
+++ b/sql/tztime.cc
@@ -1756,6 +1756,10 @@ end:
my_pthread_setspecific_ptr(THR_THD, 0);
my_pthread_setspecific_ptr(THR_MALLOC, 0);
}
+
+ default_tz= default_tz_name ? global_system_variables.time_zone
+ : my_tz_SYSTEM;
+
DBUG_RETURN(return_val);
}