diff options
| author | unknown <evgen@moonbone.local> | 2005-10-12 03:32:14 +0400 |
|---|---|---|
| committer | unknown <evgen@moonbone.local> | 2005-10-12 03:32:14 +0400 |
| commit | b455f7c575383787b27db9c8ae52fb9799a0a5e7 (patch) | |
| tree | a09394ef99d7c7d90d08beb454232ef5e10cce48 /sql | |
| parent | ab7ec7ee8f4ac8c751c6f0d84d8314154146bf10 (diff) | |
| parent | f3f84ed8a08a7c19442cdbacc9c23fbc5d38323b (diff) | |
| download | mariadb-git-b455f7c575383787b27db9c8ae52fb9799a0a5e7.tar.gz | |
Manual merge, fix for bug #7672
mysql-test/r/select.result:
Manual merge
mysql-test/t/select.test:
Manual merge
sql/item.cc:
Manual merge
sql/sql_lex.cc:
Manual merge
sql/sql_lex.h:
Manual merge
sql/sql_select.cc:
Manual merge
Diffstat (limited to 'sql')
| -rw-r--r-- | sql/item.cc | 10 | ||||
| -rw-r--r-- | sql/sql_lex.cc | 1 | ||||
| -rw-r--r-- | sql/sql_lex.h | 1 |
3 files changed, 12 insertions, 0 deletions
diff --git a/sql/item.cc b/sql/item.cc index 010189c321c..3c3a6d273fe 100644 --- a/sql/item.cc +++ b/sql/item.cc @@ -1760,6 +1760,16 @@ bool Item_field::fix_fields(THD *thd, TABLE_LIST *tables, Item **ref) if ((tmp= find_field_in_tables(thd, this, tables, &where, 0)) == not_found_field) { + if (thd->lex.select_lex.is_item_list_lookup) + { + Item** res= find_item_in_list(this, thd->lex.select_lex.item_list); + if (res && *res && (*res)->type() == Item::FIELD_ITEM) + { + set_field((*((Item_field**)res))->field); + return 0; + } + } + /* We can't find table field in table list of current select, consequently we have to find it in outer subselect(s). diff --git a/sql/sql_lex.cc b/sql/sql_lex.cc index 8636b6542fc..47de2ff36c7 100644 --- a/sql/sql_lex.cc +++ b/sql/sql_lex.cc @@ -160,6 +160,7 @@ void lex_start(THD *thd, uchar *buf,uint length) lex->duplicates= DUP_ERROR; lex->ignore= 0; lex->proc_list.first= 0; + lex->select_lex.is_item_list_lookup= 0; } void lex_end(LEX *lex) diff --git a/sql/sql_lex.h b/sql/sql_lex.h index 8d919f12563..47908ba8685 100644 --- a/sql/sql_lex.h +++ b/sql/sql_lex.h @@ -426,6 +426,7 @@ public: List<Item> item_list; /* list of fields & expressions */ List<String> interval_list, use_index, *use_index_ptr, ignore_index, *ignore_index_ptr; + bool is_item_list_lookup; /* Usualy it is pointer to ftfunc_list_alloc, but in union used to create fake select_lex for calling mysql_select under results of union |