diff options
| author | unknown <gkodinov/kgeorge@magare.gmz> | 2008-02-22 15:45:40 +0200 |
|---|---|---|
| committer | unknown <gkodinov/kgeorge@magare.gmz> | 2008-02-22 15:45:40 +0200 |
| commit | bc73783ad49e82ee6e29f82ace796e86862078c5 (patch) | |
| tree | dd029c0c97d0c553e52ea70dfa7d9dc5cfb1ecd7 /sql/sp.cc | |
| parent | e1378d1624945fabc61f90621d18d9402ca50c77 (diff) | |
| parent | 1ac319248f6d9ed920c402cb90ed52690161750c (diff) | |
| download | mariadb-git-bc73783ad49e82ee6e29f82ace796e86862078c5.tar.gz | |
Merge magare.gmz:/home/kgeorge/mysql/work/B30604-5.0-opt
into magare.gmz:/home/kgeorge/mysql/work/B30604-5.1-opt
BitKeeper/deleted/.del-binlog_innodb.result:
Auto merged
BitKeeper/deleted/.del-binlog_innodb.test:
Auto merged
mysql-test/suite/binlog/r/binlog_stm_ctype_ucs.result:
merged bug 30604 to 5.1-opt
sql/sp.cc:
merged bug 30604 to 5.1-opt
Diffstat (limited to 'sql/sp.cc')
| -rw-r--r-- | sql/sp.cc | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/sql/sp.cc b/sql/sp.cc index 83995e9b753..dd39107e6ef 100644 --- a/sql/sp.cc +++ b/sql/sp.cc @@ -388,6 +388,7 @@ db_find_routine(THD *thd, int type, sp_name *name, sp_head **sphp) uint length; char buff[65]; String str(buff, sizeof(buff), &my_charset_bin); + bool saved_time_zone_used= thd->time_zone_used; ulong sql_mode, saved_mode= thd->variables.sql_mode; Open_tables_state open_tables_state_backup; Stored_program_creation_ctx *creation_ctx; @@ -504,6 +505,11 @@ db_find_routine(THD *thd, int type, sp_name *name, sp_head **sphp) sql_mode, params, returns, body, chistics, definer, created, modified, creation_ctx); done: + /* + Restore the time zone flag as the timezone usage in proc table + does not affect replication. + */ + thd->time_zone_used= saved_time_zone_used; if (table) close_system_tables(thd, &open_tables_state_backup); thd->variables.sql_mode= saved_mode; |