summaryrefslogtreecommitdiff
path: root/sql/item.h
diff options
context:
space:
mode:
authorunknown <igor@rurik.mysql.com>2005-07-26 08:20:42 -0700
committerunknown <igor@rurik.mysql.com>2005-07-26 08:20:42 -0700
commit4903707c341c4a94e775682a71287361eaf24b92 (patch)
tree79849f799d9feb84d6b069aefc8fa80db97a288c /sql/item.h
parentae6842fd3aa3f029d89c64d0652e520703586b59 (diff)
downloadmariadb-git-4903707c341c4a94e775682a71287361eaf24b92.tar.gz
item.h:
Post review change in Item_ref::get_tmp_table_field (bug #11412). sql/item.h: Post review change in Item_ref::get_tmp_table_field (bug #11412).
Diffstat (limited to 'sql/item.h')
-rw-r--r--sql/item.h5
1 files changed, 4 insertions, 1 deletions
diff --git a/sql/item.h b/sql/item.h
index 259b3654461..c9f87c4df90 100644
--- a/sql/item.h
+++ b/sql/item.h
@@ -1467,7 +1467,10 @@ public:
Field *get_tmp_table_field()
{ return result_field ? result_field : (*ref)->get_tmp_table_field(); }
Item *get_tmp_table_item(THD *thd)
- { return (*ref)->get_tmp_table_item(thd); }
+ {
+ return (result_field ? new Item_field(result_field) :
+ (*ref)->get_tmp_table_item(thd));
+ }
table_map used_tables() const
{
return depended_from ? OUTER_REF_TABLE_BIT : (*ref)->used_tables();