diff options
| author | Konstantin Osipov <kostja@sun.com> | 2010-02-03 03:06:42 +0300 |
|---|---|---|
| committer | Konstantin Osipov <kostja@sun.com> | 2010-02-03 03:06:42 +0300 |
| commit | 0ce6d93f858eb5b67f8988946274ab2b9f060de4 (patch) | |
| tree | 8555c47c0ce18227ce535252d2c2966af26183d3 /sql/tztime.cc | |
| parent | c2fe19883e624ddd0e37768f860fa0853848adb3 (diff) | |
| parent | e698ae01128fde4f82d4595e67a72cfac09ca125 (diff) | |
| download | mariadb-git-0ce6d93f858eb5b67f8988946274ab2b9f060de4.tar.gz | |
Merge next-mr -> next-4284.
Diffstat (limited to 'sql/tztime.cc')
| -rw-r--r-- | sql/tztime.cc | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/sql/tztime.cc b/sql/tztime.cc index aa9780754d7..453df125804 100644 --- a/sql/tztime.cc +++ b/sql/tztime.cc @@ -1761,6 +1761,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); } |