← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/sql_derived.cc

  • Committer: Brian Aker
  • Date: 2010-10-09 00:49:33 UTC
  • mfrom: (1812.5.8 staging)
  • Revision ID: brian@tangent.org-20101009004933-tehugnkubtzp6uy4
Merge in changes for show create table.

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/sql_derived.cc
144
144
    }
145
145
    else
146
146
    {
147
 
      if (! session->fill_derived_tables())
148
 
      {
149
 
        delete derived_result;
150
 
        derived_result= NULL;
151
 
      }
152
147
      orig_table_list->derived_result= derived_result;
153
148
      orig_table_list->table= table;
154
149
      orig_table_list->table_name=        const_cast<char *>(table->getShare()->getTableName());