summaryrefslogtreecommitdiff
path: root/sql/sql_select.cc
diff options
context:
space:
mode:
authorunknown <bell@sanja.is.com.ua>2003-11-02 17:27:35 +0200
committerunknown <bell@sanja.is.com.ua>2003-11-02 17:27:35 +0200
commit5fe5142694df34c8dbd6b50d130c935126e9f558 (patch)
tree5dc5154988d455ced7025ef0091ac549d6269555 /sql/sql_select.cc
parent1e1d7b17b43907f48ba72cc18cd0537a7071868b (diff)
downloadmariadb-git-5fe5142694df34c8dbd6b50d130c935126e9f558.tar.gz
fixed BUG#1645
all calls of fix_fields() are inspected (copy of cset which I lost in accidatly tree delete) mysql-test/r/subselect.result: test of BUG#1645 mysql-test/t/subselect.test: test of BUG#1645 sql/item_subselect.cc: removed passing left_expr through parameters, because it present in class fields fixed fix_fields() call sql/item_subselect.h: removed passing left_expr through parameters, because it present in class fields sql/set_var.cc: comments added sql/sql_select.cc: fixed BUG#1645 (thd can be used in fix_fields of subqueries)
Diffstat (limited to 'sql/sql_select.cc')
-rw-r--r--sql/sql_select.cc6
1 files changed, 1 insertions, 5 deletions
diff --git a/sql/sql_select.cc b/sql/sql_select.cc
index 34b55367163..f209bf886ff 100644
--- a/sql/sql_select.cc
+++ b/sql/sql_select.cc
@@ -8525,11 +8525,7 @@ static bool add_ref_to_table_cond(THD *thd, JOIN_TAB *join_tab)
if (thd->is_fatal_error)
DBUG_RETURN(TRUE);
- /*
- Here we pass 0 as the first argument to fix_fields that don't need
- to do any stack checking (This is already done in the initial fix_fields).
- */
- cond->fix_fields((THD *) 0,(TABLE_LIST *) 0, (Item**)&cond);
+ cond->fix_fields(thd,(TABLE_LIST *) 0, (Item**)&cond);
if (join_tab->select)
{
error=(int) cond->add(join_tab->select->cond);