diff options
| author | jani@rhols221.adsl.netsonic.fi <> | 2004-09-16 16:24:45 +0300 |
|---|---|---|
| committer | jani@rhols221.adsl.netsonic.fi <> | 2004-09-16 16:24:45 +0300 |
| commit | ac55486644f85b718131e3ec24b09bfa59b4cf16 (patch) | |
| tree | d177ad8c3eec18d2a6aa7ce2c040374a902b4142 /sql/tztime.cc | |
| parent | dd5d2d8a6d2cfeeb1f85f78cb33ee42bcf3c0d0d (diff) | |
| download | mariadb-git-ac55486644f85b718131e3ec24b09bfa59b4cf16.tar.gz | |
A fix for MetroWerks compiler.
Diffstat (limited to 'sql/tztime.cc')
| -rw-r--r-- | sql/tztime.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sql/tztime.cc b/sql/tztime.cc index af9af530fec..08e6fc7026e 100644 --- a/sql/tztime.cc +++ b/sql/tztime.cc @@ -1636,8 +1636,8 @@ end_with_setting_default_tz: /* If we have default time zone try to load it */ if (default_tzname) { - String tzname(default_tzname, &my_charset_latin1); - if (!(global_system_variables.time_zone= my_tz_find(&tzname, tables))) + String tmp_tzname(default_tzname, &my_charset_latin1); + if (!(global_system_variables.time_zone= my_tz_find(&tmp_tzname, tables))) { sql_print_error("Fatal error: Illegal or unknown default time zone '%s'", default_tzname); |