diff options
| author | dlenev@mysql.com <> | 2005-01-28 10:22:50 +0300 |
|---|---|---|
| committer | dlenev@mysql.com <> | 2005-01-28 10:22:50 +0300 |
| commit | 2276bfa37470806bca135c83fcfb9c7678ec0164 (patch) | |
| tree | 654d19586759f3b5343d53fba8af67eb8e5ce42f /sql/set_var.h | |
| parent | af12846505834548225cfa636641379756ae7dc8 (diff) | |
| parent | c80c503a1b869bfde11b104fdde9d05f3d0de5a0 (diff) | |
| download | mariadb-git-2276bfa37470806bca135c83fcfb9c7678ec0164.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.
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); }; |