After merge fix.

7419f502 · istruewing@chilla.local · 5d509b32 · 7419f502
Commit 7419f502 authored Sep 19, 2006 by istruewing@chilla.local
Show whitespace changes
Inline Side-by-side

Showing with 7 additions and 6 deletions

sql/sql_select.cc sql/sql_select.cc +7 -6

No files found.
--- a/sql/sql_select.cc
+++ b/sql/sql_select.cc
@@ -13241,6 +13241,7 @@ setup_copy_fields(THD *thd, TMP_TABLE_PARAM *param,
          copy++;
        }
      }
+    }
    else if ((real_pos->type() == Item::FUNC_ITEM ||
 	      real_pos->type() == Item::SUBSELECT_ITEM ||
 	      real_pos->type() == Item::CACHE_ITEM ||