← 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-05-20 18:55:16 UTC
  • mfrom: (1552.1.2 new-staging)
  • Revision ID: brian@gaz-20100520185516-gcr6tl3tm6v71kb5
Merge Brian, includes work to move all TableShare to being newed, introduced
placeholder to be used for placeholders. This also includes a number of bug
fixes.

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/sql_derived.cc
151
151
      }
152
152
      orig_table_list->derived_result= derived_result;
153
153
      orig_table_list->table= table;
154
 
      orig_table_list->table_name=        const_cast<char *>(table->s->getTableName());
155
 
      orig_table_list->table_name_length= table->s->getTableNameSize();
 
154
      orig_table_list->table_name=        const_cast<char *>(table->getShare()->getTableName());
 
155
      orig_table_list->table_name_length= table->getShare()->getTableNameSize();
156
156
      table->derived_select_number= first_select->select_number;
157
 
      table->s->tmp_table= message::Table::TEMPORARY;
 
157
      table->getMutableShare()->tmp_table= message::Table::TEMPORARY;
158
158
      orig_table_list->db= (char *)"";
159
159
      orig_table_list->db_length= 0;
160
160
      /* Force read of table stats in the optimizer */