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/item_create.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/item_create.cc')
| -rw-r--r-- | sql/item_create.cc | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/sql/item_create.cc b/sql/item_create.cc index ff5825ef389..6a1e87a3aae 100644 --- a/sql/item_create.cc +++ b/sql/item_create.cc @@ -2877,9 +2877,6 @@ Create_func_convert_tz Create_func_convert_tz::s_singleton; Item* Create_func_convert_tz::create(THD *thd, Item *arg1, Item *arg2, Item *arg3) { - if (thd->lex->add_time_zone_tables_to_query_tables(thd)) - return NULL; - return new (thd->mem_root) Item_func_convert_tz(arg1, arg2, arg3); } |