← 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-07-09 20:51:34 UTC
  • mfrom: (1643.4.3 drizzle)
  • Revision ID: brian@gaz-20100709205134-ru4s0889youfrmm5
Merge of Patrick

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/sql_derived.cc
137
137
    if (res)
138
138
    {
139
139
      if (table)
140
 
        table->free_tmp_table(session);
 
140
      {
 
141
        table= 0;
 
142
      }
141
143
      delete derived_result;
142
144
    }
143
145
    else
149
151
      }
150
152
      orig_table_list->derived_result= derived_result;
151
153
      orig_table_list->table= table;
152
 
      orig_table_list->table_name=        table->s->table_name.str;
153
 
      orig_table_list->table_name_length= table->s->table_name.length;
 
154
      orig_table_list->table_name=        const_cast<char *>(table->getShare()->getTableName());
 
155
      orig_table_list->table_name_length= table->getShare()->getTableNameSize();
154
156
      table->derived_select_number= first_select->select_number;
155
 
      table->s->tmp_table= message::Table::TEMPORARY;
156
157
      orig_table_list->db= (char *)"";
157
158
      orig_table_list->db_length= 0;
158
159
      /* Force read of table stats in the optimizer */
159
160
      table->cursor->info(HA_STATUS_VARIABLE);
160
161
      /* Add new temporary table to list of open derived tables */
161
 
      table->next= session->derived_tables;
 
162
      table->setNext(session->derived_tables);
162
163
      session->derived_tables= table;
163
164
    }
164
165
  }