diff options
| author | unknown <konstantin@mysql.com> | 2005-09-23 00:46:59 +0400 |
|---|---|---|
| committer | unknown <konstantin@mysql.com> | 2005-09-23 00:46:59 +0400 |
| commit | 38ebb6c638060bf31eccee86856f5b5855bd0f27 (patch) | |
| tree | c8753cbe4273232bc93f91ecd04ad7014cee9cdb /sql/sql_lex.h | |
| parent | 2fec728eb73cbd9177564faf4dc7ef64c9288a54 (diff) | |
| parent | ac9c1fa39bb770a568387c2bee08c8821abdbf92 (diff) | |
| download | mariadb-git-38ebb6c638060bf31eccee86856f5b5855bd0f27.tar.gz | |
Merge mysqldev@production.mysql.com:my/mysql-5.0-release
into mysql.com:/opt/local/work/mysql-5.0-root
BitKeeper/etc/ignore:
auto-union
include/my_sys.h:
Auto merged
mysql-test/r/information_schema.result:
Auto merged
mysql-test/t/ctype_ujis.test:
Auto merged
sql/ha_federated.cc:
Auto merged
sql/handler.cc:
Auto merged
sql/item_func.h:
Auto merged
sql/log.cc:
Auto merged
sql/sp_head.cc:
Auto merged
sql/sp_head.h:
Auto merged
sql/sql_acl.cc:
Auto merged
sql/sql_base.cc:
Auto merged
sql/sql_class.cc:
Auto merged
sql/sql_class.h:
Auto merged
sql/sql_lex.h:
Auto merged
sql/sql_prepare.cc:
Auto merged
sql/sql_select.cc:
Auto merged
sql/sql_view.cc:
Auto merged
sql/table.cc:
Auto merged
Diffstat (limited to 'sql/sql_lex.h')
| -rw-r--r-- | sql/sql_lex.h | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/sql/sql_lex.h b/sql/sql_lex.h index dd5fdf51daf..8d7ec25f97b 100644 --- a/sql/sql_lex.h +++ b/sql/sql_lex.h @@ -432,10 +432,6 @@ public: { return my_reinterpret_cast(st_select_lex*)(slave); } - st_select_lex* first_select_in_union() - { - return my_reinterpret_cast(st_select_lex*)(slave); - } st_select_lex_unit* next_unit() { return my_reinterpret_cast(st_select_lex_unit*)(next); @@ -445,8 +441,7 @@ public: void exclude_tree(); /* UNION methods */ - bool prepare(THD *thd, select_result *result, ulong additional_options, - const char *tmp_table_alias); + bool prepare(THD *thd, select_result *result, ulong additional_options); bool exec(); bool cleanup(); inline void unclean() { cleaned= 0; } @@ -462,7 +457,10 @@ public: friend void lex_start(THD *thd, uchar *buf, uint length); friend int subselect_union_engine::exec(); + + List<Item> *get_unit_column_types(); }; + typedef class st_select_lex_unit SELECT_LEX_UNIT; /* |