diff options
| author | unknown <kroki/tomash@moonlight.home> | 2007-03-09 13:17:46 +0300 |
|---|---|---|
| committer | unknown <kroki/tomash@moonlight.home> | 2007-03-09 13:17:46 +0300 |
| commit | b311d870523b6c1bae7e3a49e9d04d2c30bef5b2 (patch) | |
| tree | 6197d95ef12f5c0b810b541f1b32c7955b0b1d7b /sql/log_event.cc | |
| parent | 1b198eeb6893b4095c70df224eafb2c823f8970f (diff) | |
| parent | 0ea47f3ed46011263d696f9852190c6a2edf4772 (diff) | |
| download | mariadb-git-b311d870523b6c1bae7e3a49e9d04d2c30bef5b2.tar.gz | |
Merge moonlight.home:/home/tomash/src/mysql_ab/mysql-5.1
into moonlight.home:/home/tomash/src/mysql_ab/mysql-5.1-bug9953
mysql-test/r/sp-error.result:
Auto merged
mysql-test/r/view.result:
Auto merged
sql/item_timefunc.cc:
Auto merged
sql/lock.cc:
Auto merged
sql/log_event.cc:
Auto merged
sql/mysql_priv.h:
Auto merged
sql/set_var.cc:
Auto merged
sql/sp.cc:
Auto merged
sql/sql_base.cc:
Auto merged
sql/sql_help.cc:
Auto merged
sql/sql_lex.cc:
Auto merged
sql/sql_lex.h:
Auto merged
sql/sql_parse.cc:
Auto merged
sql/sql_show.cc:
Auto merged
sql/sql_view.cc:
Auto merged
sql/table.cc:
Auto merged
sql/tztime.cc:
Auto merged
storage/myisam/ha_myisam.cc:
Auto merged
sql/sql_yacc.yy:
SCCS merged
Diffstat (limited to 'sql/log_event.cc')
| -rw-r--r-- | sql/log_event.cc | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/sql/log_event.cc b/sql/log_event.cc index f8d3c43bfba..e4fb5354615 100644 --- a/sql/log_event.cc +++ b/sql/log_event.cc @@ -2006,8 +2006,7 @@ int Query_log_event::exec_event(struct st_relay_log_info* rli, if (time_zone_len) { String tmp(time_zone_str, time_zone_len, &my_charset_bin); - if (!(thd->variables.time_zone= - my_tz_find_with_opening_tz_tables(thd, &tmp))) + if (!(thd->variables.time_zone= my_tz_find(thd, &tmp))) { my_error(ER_UNKNOWN_TIME_ZONE, MYF(0), tmp.c_ptr()); thd->variables.time_zone= global_system_variables.time_zone; |