diff options
| author | msvensson@pilot.blaudden <> | 2007-03-01 18:12:56 +0100 |
|---|---|---|
| committer | msvensson@pilot.blaudden <> | 2007-03-01 18:12:56 +0100 |
| commit | f5778fc73e4e676f38c4734bca3a96f4d08dc2d7 (patch) | |
| tree | dd839a6db9e2985054d2bc99faaafdc4440866fc /sql/tztime.cc | |
| parent | ab61d07a30b73e3446b6eab9536ba464a0d55f74 (diff) | |
| parent | 2f5a2b2476a0ca43d0a5bdfb979b427ff806839f (diff) | |
| download | mariadb-git-f5778fc73e4e676f38c4734bca3a96f4d08dc2d7.tar.gz | |
Merge pilot.blaudden:/home/msvensson/mysql/mysql-5.0
into pilot.blaudden:/home/msvensson/mysql/mysql-5.0-maint
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 ac1fa4ddff8..70f7cc5ea86 100644 --- a/sql/tztime.cc +++ b/sql/tztime.cc @@ -1772,8 +1772,8 @@ end_with_setting_default_tz: /* If we have default time zone try to load it */ if (default_tzname) { - String tmp_tzname(default_tzname, &my_charset_latin1); - if (!(global_system_variables.time_zone= my_tz_find(&tmp_tzname, tables))) + String tmp_tzname2(default_tzname, &my_charset_latin1); + if (!(global_system_variables.time_zone= my_tz_find(&tmp_tzname2, tables))) { sql_print_error("Fatal error: Illegal or unknown default time zone '%s'", default_tzname); |