summaryrefslogtreecommitdiff
path: root/sql
diff options
context:
space:
mode:
authorunknown <evgen@sunlight.local>2007-02-26 09:01:43 +0300
committerunknown <evgen@sunlight.local>2007-02-26 09:01:43 +0300
commit90d4f80922c7f8873ed8c415303f8d7276f5e32d (patch)
tree5349bbd3cd5df18e8cc96e51039a2e99cf80cde8 /sql
parent84e68927195baf4a0f1704745be73f00db1086b0 (diff)
downloadmariadb-git-90d4f80922c7f8873ed8c415303f8d7276f5e32d.tar.gz
item.cc, item.h:
Post fix for bug#23800. sql/item.h: Post fix for bug#23800. sql/item.cc: Post fix for bug#23800.
Diffstat (limited to 'sql')
-rw-r--r--sql/item.cc1
-rw-r--r--sql/item.h1
2 files changed, 1 insertions, 1 deletions
diff --git a/sql/item.cc b/sql/item.cc
index 9149a1240ea..cc41b83f8d9 100644
--- a/sql/item.cc
+++ b/sql/item.cc
@@ -5497,6 +5497,7 @@ bool Item_outer_ref::fix_fields(THD *thd, Item **reference)
if (!outer_field->fixed &&
(outer_field->fix_fields(thd, reference)))
return TRUE;
+ table_name= outer_field->table_name;
return Item_direct_ref::fix_fields(thd, reference);
}
diff --git a/sql/item.h b/sql/item.h
index 93b43c8b61a..ec6d4fabae5 100644
--- a/sql/item.h
+++ b/sql/item.h
@@ -1968,7 +1968,6 @@ public:
outer_field_arg->field_name),
outer_field(outer_field_arg)
{
- table_name= my_strdup(outer_field_arg->table_name, MYF(MY_WME));
ref= (Item**)&outer_field;
set_properties();
fixed= 0;