Post-merge fixes

aa6b0bcb · unknown · cb5f5ee2 · aa6b0bcb
Commit aa6b0bcb authored Dec 10, 2003 by unknown
Hide whitespace changes
Inline Side-by-side

Showing with 1 addition and 1 deletion

sql/sql_union.cc sql/sql_union.cc +1 -1

No files found.
--- a/sql/sql_union.cc
+++ b/sql/sql_union.cc
@@ -143,7 +143,7 @@ int st_select_lex_unit::prepare(THD *thd_arg, select_result *sel_result)
    first_select->braces= 1;
  }

-  for (sl= select_cursor; sl; sl= sl->next_select())
+  for (;sl; sl= sl->next_select())
  {
    JOIN *join= new JOIN(thd_arg, sl->item_list, 
 			 sl->options | thd_arg->options | SELECT_NO_UNLOCK,