merge 5.1 => 5.5

9f3674cc · Tor Didriksen · dad930b4 · a42662c1 · 9f3674cc
Commit 9f3674cc authored Apr 02, 2013 by Tor Didriksen
Show whitespace changes
Inline Side-by-side

Showing with 1 addition and 1 deletion

sql/sql_select.cc sql/sql_select.cc +1 -1

No files found.
--- a/sql/sql_select.cc
+++ b/sql/sql_select.cc
@@ -9994,7 +9994,7 @@ static Field *create_tmp_field_from_item(THD *thd, Item *item, TABLE *table,
  if (new_field)
    new_field->init(table);
-  if (copy_func && item->is_result_field())
+  if (copy_func && item->real_item()->is_result_field())
    *((*copy_func)++) = item;			// Save for copy_funcs
  if (modify_item)
    item->set_result_field(new_field);