summaryrefslogtreecommitdiff
path: root/sql/item.cc
diff options
context:
space:
mode:
authorsergefp@mysql.com <>2004-12-13 20:06:06 +0300
committersergefp@mysql.com <>2004-12-13 20:06:06 +0300
commit9ed8cd701bd64feb07bff2426e985343447b9f6a (patch)
tree64511cf791534c9423364cdf49dc849d5c6dc032 /sql/item.cc
parent2d9fae642c69654ae5d5d3a91817e7ab10972a3f (diff)
downloadmariadb-git-9ed8cd701bd64feb07bff2426e985343447b9f6a.tar.gz
Merging fix for BUG#6976 from 4.0 to 4.1
The problem in 4.1 was the same as in 4.0 - fix_fields() not called for created Item_ref. The fix is similar too - initialize Item_refs in ctor (but don't interfere with cases when Item_ref is used by subselects).
Diffstat (limited to 'sql/item.cc')
-rw-r--r--sql/item.cc4
1 files changed, 2 insertions, 2 deletions
diff --git a/sql/item.cc b/sql/item.cc
index 31c35e87cd4..85e200920f1 100644
--- a/sql/item.cc
+++ b/sql/item.cc
@@ -1488,9 +1488,9 @@ bool Item_field::fix_fields(THD *thd, TABLE_LIST *tables, Item **ref)
"forward reference in item list");
return -1;
}
-
Item_ref *rf= new Item_ref(last->ref_pointer_array + counter,
- (char *)table_name, (char *)field_name);
+ (char *)table_name, (char *)field_name,
+ this);
if (!rf)
return 1;
thd->change_item_tree(ref, rf);