← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/sql_derived.cc

  • Committer: Mark Atwood
  • Date: 2011-06-24 02:13:02 UTC
  • mfrom: (2318.6.56 rf)
  • Revision ID: me@mark.atwood.name-20110624021302-y9oiksid220xan9s
merge lp:~olafvdspek/drizzle/refactor14

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/sql_derived.cc
109
109
      sl->context.outer_context= 0;
110
110
 
111
111
    if (!(derived_result= new select_union))
112
 
      return(true); // out of memory
 
112
      return true; // out of memory
113
113
 
114
114
    // Select_Lex_Unit::prepare correctly work for single select
115
115
    if ((res= unit->prepare(session, derived_result, 0)))
164
164
    }
165
165
  }
166
166
 
167
 
  return(res);
 
167
  return res;
168
168
}
169
169
 
170
170
/*