diff options
| author | unknown <bell@sanja.is.com.ua> | 2005-03-23 08:36:48 +0200 |
|---|---|---|
| committer | unknown <bell@sanja.is.com.ua> | 2005-03-23 08:36:48 +0200 |
| commit | 5a425250271f796e68514f9484a67df218ddb9d2 (patch) | |
| tree | 1a44d0ad7fd7c6b39daf960d107346319e9f5e74 /sql/sql_lex.h | |
| parent | 98eecc7b35f4da432b1388bbfd3e3f0cd63b49f5 (diff) | |
| download | mariadb-git-5a425250271f796e68514f9484a67df218ddb9d2.tar.gz | |
fixed union types merging and table related metadata (BUG#8824)
mysql-test/r/func_group.result:
new result
mysql-test/r/metadata.result:
new result
test of metadata of variables, unions and derived tables
mysql-test/r/union.result:
new results
test of union of enum
mysql-test/t/metadata.test:
test of metadata of variables, unions and derived tables
mysql-test/t/union.test:
test of union of enum
sql/field.cc:
Field type merging rules added
Fixed table name/alias returting for field made from temporary tables
sql/field.h:
removed unned field type reporting
sql/item.cc:
fixed bug in NEW_DATE type field creartion
replaced mechanism of merging types of UNION
sql/item.h:
replaced mechanism of merging types of UNION
sql/item_func.h:
new item type to make correct field type detection possible
sql/item_subselect.cc:
added table name parameter to prepare() to show right table alias for derived tables
sql/sql_derived.cc:
added table name parameter to prepare() to show right table alias for derived tables
sql/sql_lex.h:
added table name parameter to prepare() to show right table alias for derived tables
sql/sql_parse.cc:
made function for enum/set pack length calculation
sql/sql_prepare.cc:
added table name parameter to prepare() to show right table alias for derived tables
sql/sql_select.cc:
new temporary table field creation by Item_type_holder
fixed table alias for temporary table
sql/sql_union.cc:
added table name parameter to prepare() to show right table alias for derived tables
Diffstat (limited to 'sql/sql_lex.h')
| -rw-r--r-- | sql/sql_lex.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/sql/sql_lex.h b/sql/sql_lex.h index f48ff42bbf8..927982e444f 100644 --- a/sql/sql_lex.h +++ b/sql/sql_lex.h @@ -389,7 +389,8 @@ public: void exclude_tree(); /* UNION methods */ - int prepare(THD *thd, select_result *result, ulong additional_options); + int prepare(THD *thd, select_result *result, ulong additional_options, + const char *tmp_table_alias); int exec(); int cleanup(); inline void unclean() { cleaned= 0; } |