diff options
| author | Marc Alff <marc.alff@sun.com> | 2009-09-10 03:18:29 -0600 |
|---|---|---|
| committer | Marc Alff <marc.alff@sun.com> | 2009-09-10 03:18:29 -0600 |
| commit | 63e56390a3f1a4f80642932a790ab74f28de8010 (patch) | |
| tree | 8b611255f83ad274f072855f5acfe484a971de87 /sql/tztime.cc | |
| parent | 905d715f10e711860311e0a10488c6bb5e19ee49 (diff) | |
| download | mariadb-git-63e56390a3f1a4f80642932a790ab74f28de8010.tar.gz | |
WL#2110 (SIGNAL)
WL#2265 (RESIGNAL)
Manual merge of SIGNAL and RESIGNAL to mysql-trunk-signal,
plus required dependencies.
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 c7a4ad049ec..6757798ad32 100644 --- a/sql/tztime.cc +++ b/sql/tztime.cc @@ -1645,7 +1645,7 @@ my_tz_init(THD *org_thd, const char *default_tzname, my_bool bootstrap) if (open_system_tables_for_read(thd, tz_tables, &open_tables_state_backup)) { sql_print_warning("Can't open and lock time zone table: %s " - "trying to live without them", thd->main_da.message()); + "trying to live without them", thd->stmt_da->message()); /* We will try emulate that everything is ok */ return_val= time_zone_tables_exist= 0; goto end_with_setting_default_tz; |