← 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 11:45:17 UTC
  • mfrom: (2318.6.64 rf)
  • Revision ID: me@mark.atwood.name-20110624114517-1mq8no6jlp2nrg7m
merge lp:~olafvdspek/drizzle/refactor15

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/sql_derived.cc
25
25
#include <drizzled/session.h>
26
26
#include <drizzled/open_tables_state.h>
27
27
 
28
 
namespace drizzled
29
 
{
 
28
namespace drizzled {
30
29
 
31
30
/*
32
31
  Call given derived table processor (preparing or filling tables)
108
107
    for (Select_Lex *sl= first_select; sl; sl= sl->next_select())
109
108
      sl->context.outer_context= 0;
110
109
 
111
 
    if (!(derived_result= new select_union))
112
 
      return true; // out of memory
 
110
    derived_result= new select_union;
113
111
 
114
112
    // Select_Lex_Unit::prepare correctly work for single select
115
113
    if ((res= unit->prepare(session, derived_result, 0)))
141
139
    */
142
140
    if (res)
143
141
    {
144
 
      if (table)
145
 
      {
146
 
        table= 0;
147
 
      }
 
142
      table= 0;
148
143
      delete derived_result;
149
144
    }
150
145
    else