diff options
| author | unknown <dlenev@mysql.com> | 2005-01-28 10:22:50 +0300 |
|---|---|---|
| committer | unknown <dlenev@mysql.com> | 2005-01-28 10:22:50 +0300 |
| commit | 8cac2c0562ec5460368be91602b329ddce653d0d (patch) | |
| tree | 654d19586759f3b5343d53fba8af67eb8e5ce42f /sql/set_var.h | |
| parent | a6bfe13c6f4fc2e0c2bebea8a295a445aa5765e8 (diff) | |
| parent | bf89dc063a6576cb08f2da29c8f505846965590b (diff) | |
| download | mariadb-git-8cac2c0562ec5460368be91602b329ddce653d0d.tar.gz | |
Manual merge of fixes for bugs #7899 "CREATE TABLE .. SELECT .. and
CONVERT_TZ() function does not work well together" and bug #7705
"CONVERT_TZ() crashes with subquery/WHERE on index column" in 5.0
tree.
mysql-test/r/timezone2.result:
Auto merged
mysql-test/t/timezone2.test:
Auto merged
sql/item_timefunc.cc:
Auto merged
sql/item_timefunc.h:
Auto merged
sql/set_var.h:
Auto merged
sql/set_var.cc:
Manual merge.
sql/sql_lex.cc:
Ignoring changes in st_lex::unlink_first_table()/link_first_table_back()
made in 4.1 since they are not applicable to 5.0.
sql/tztime.cc:
Manual merge.
Diffstat (limited to 'sql/set_var.h')
| -rw-r--r-- | sql/set_var.h | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/sql/set_var.h b/sql/set_var.h index 0f30f764ed5..8514b518660 100644 --- a/sql/set_var.h +++ b/sql/set_var.h @@ -724,7 +724,6 @@ public: bool update(THD *thd, set_var *var); byte *value_ptr(THD *thd, enum_var_type type, LEX_STRING *base); virtual void set_default(THD *thd, enum_var_type type); - Time_zone **get_tz_ptr(THD *thd, enum_var_type type); }; |