diff options
| author | unknown <bell@sanja.is.com.ua> | 2003-01-29 19:42:39 +0200 |
|---|---|---|
| committer | unknown <bell@sanja.is.com.ua> | 2003-01-29 19:42:39 +0200 |
| commit | b2ffb29ad7c21f03eb606660fa345d54b776b900 (patch) | |
| tree | 185b3adb213d5a97368591628a459b65b72ea537 /sql/item_subselect.cc | |
| parent | b343de721e7b3bee2cb3d262875dbe5357e230b6 (diff) | |
| download | mariadb-git-b2ffb29ad7c21f03eb606660fa345d54b776b900.tar.gz | |
improving of fields list creation in derived tables and unions
fixed length of fields created in fubselect
fixed resolving fields of reduced in derived table subselect
mysql-test/r/subselect.result:
test of created with subselect fields
mysql-test/t/subselect.test:
test of created with subselect fields
sql/item.cc:
fixed length of fields created in fubselect
fixed resolving fields of reduced in derived table subselect
sql/item_subselect.cc:
improving of fields list creation in derived tables and unions
sql/mysql_priv.h:
improving of fields list creation in derived tables and unions
sql/sql_derived.cc:
improving of fields list creation in derived tables and unions
sql/sql_lex.h:
improving of fields list creation in derived tables and unions
sql/sql_parse.cc:
improving of fields list creation in derived tables and unions
sql/sql_prepare.cc:
improving of fields list creation in derived tables and unions
sql/sql_select.cc:
improving of fields list creation in derived tables and unions
sql/sql_select.h:
improving of fields list creation in derived tables and unions
sql/sql_union.cc:
improving of fields list creation in derived tables and unions
sql/sql_update.cc:
improving of fields list creation in derived tables and unions
Diffstat (limited to 'sql/item_subselect.cc')
| -rw-r--r-- | sql/item_subselect.cc | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/sql/item_subselect.cc b/sql/item_subselect.cc index ffb4d715159..9a3019ece12 100644 --- a/sql/item_subselect.cc +++ b/sql/item_subselect.cc @@ -161,7 +161,7 @@ void Item_singlerow_subselect::select_transformer(THD *thd, select_lex->item_list.elements == 1 && // TODO: mark subselect items from item list separately !(select_lex->item_list.head()->type() == FIELD_ITEM || - select_lex->item_list.head()->type() == REF_ITEM) + select_lex->item_list.head()->type() == REF_ITEM) ) { @@ -693,7 +693,7 @@ int subselect_single_select_engine::prepare() (ORDER*) select_lex->group_list.first, select_lex->having, (ORDER*) 0, select_lex, - select_lex->master_unit(), 0)) + select_lex->master_unit(), 0, 0)) return 1; thd->lex.current_select= save_select; return 0; @@ -701,7 +701,7 @@ int subselect_single_select_engine::prepare() int subselect_union_engine::prepare() { - return unit->prepare(thd, result); + return unit->prepare(thd, result, 0); } static Item_result set_row(SELECT_LEX *select_lex, Item * item, |