← 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-20 20:25:52 UTC
  • mto: (1864.2.1 merge)
  • mto: This revision was merged to the branch mainline in revision 1865.
  • Revision ID: brian@tangent.org-20101020202552-51y5sz5ledoxbp7t
Add support for --with-valgrind

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/sql_derived.cc
146
146
    {
147
147
      orig_table_list->derived_result= derived_result;
148
148
      orig_table_list->table= table;
149
 
      orig_table_list->setTableName(const_cast<char *>(table->getShare()->getTableName()));
 
149
      orig_table_list->table_name=        const_cast<char *>(table->getShare()->getTableName());
150
150
      orig_table_list->table_name_length= table->getShare()->getTableNameSize();
151
151
      table->derived_select_number= first_select->select_number;
152
 
      orig_table_list->setSchemaName((char *)"");
 
152
      orig_table_list->db= (char *)"";
153
153
      orig_table_list->db_length= 0;
154
154
      /* Force read of table stats in the optimizer */
155
155
      table->cursor->info(HA_STATUS_VARIABLE);
156
156
      /* Add new temporary table to list of open derived tables */
157
 
      table->setNext(session->getDerivedTables());
158
 
      session->setDerivedTables(table);
 
157
      table->setNext(session->derived_tables);
 
158
      session->derived_tables= table;
159
159
    }
160
160
  }
161
161
 
214
214
                        first_select->item_list, first_select->where,
215
215
                        (first_select->order_list.elements+
216
216
                        first_select->group_list.elements),
217
 
                        (Order *) first_select->order_list.first,
218
 
                        (Order *) first_select->group_list.first,
 
217
                        (order_st *) first_select->order_list.first,
 
218
                        (order_st *) first_select->group_list.first,
219
219
                        first_select->having,
220
220
                        (first_select->options | session->options | SELECT_NO_UNLOCK),
221
221
                        derived_result, unit, first_select);