← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/sql_delete.cc

Merge in stewart

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/sql_delete.cc
241
241
 
242
242
  if (usable_index==MAX_KEY)
243
243
  {
244
 
    info.init_read_record(session,table,select,1,1);
 
244
    if ((error= info.init_read_record(session,table,select,1,1)))
 
245
    {
 
246
      table->print_error(error, MYF(0));
 
247
      delete select;
 
248
      free_underlaid_joins(session, select_lex);
 
249
      return true;
 
250
    }
245
251
  }
246
252
  else
247
253
  {
248
 
    info.init_read_record_idx(session, table, 1, usable_index);
 
254
    if ((error= info.init_read_record_idx(session, table, 1, usable_index)))
 
255
    {
 
256
      table->print_error(error, MYF(0));
 
257
      delete select;
 
258
      free_underlaid_joins(session, select_lex);
 
259
      return true;
 
260
    }
249
261
  }
250
262
 
251
263
  session->set_proc_info("updating");