← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/sql_delete.cc

  • Committer: Brian Aker
  • Date: 2008-08-18 20:57:01 UTC
  • mto: This revision was merged to the branch mainline in revision 352.
  • Revision ID: brian@tangent.org-20080818205701-rzeyd4qw4xj7wx7l
Refactoring of class Table

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/sql_delete.cc
75
75
 
76
76
      if (select_lex->setup_ref_array(thd, order->elements) ||
77
77
          setup_order(thd, select_lex->ref_pointer_array, &tables,
78
 
                    fields, all_fields, (ORDER*) order->first))
 
78
                    fields, all_fields, (order_st*) order->first))
79
79
    {
80
80
      delete select;
81
81
      free_underlaid_joins(thd, &thd->lex->select_lex);
196
196
    ha_rows examined_rows;
197
197
    
198
198
    if ((!select || table->quick_keys.is_clear_all()) && limit != HA_POS_ERROR)
199
 
      usable_index= get_index_for_order(table, (ORDER*)(order->first), limit);
 
199
      usable_index= get_index_for_order(table, (order_st*)(order->first), limit);
200
200
 
201
201
    if (usable_index == MAX_KEY)
202
202
    {
203
203
      table->sort.io_cache= (IO_CACHE *) my_malloc(sizeof(IO_CACHE),
204
204
                                                   MYF(MY_FAE | MY_ZEROFILL));
205
205
    
206
 
      if (!(sortorder= make_unireg_sortorder((ORDER*) order->first,
 
206
      if (!(sortorder= make_unireg_sortorder((order_st*) order->first,
207
207
                                             &length, NULL)) ||
208
208
          (table->sort.found_records = filesort(thd, table, sortorder, length,
209
209
                                                select, HA_POS_ERROR, 1,