← Back to branch summary

~ubuntu-branches/ubuntu/precise/mysql-5.1/precise

« back to all changes in this revision

Viewing changes to sql/sql_delete.cc

  • Committer: Bazaar Package Importer
  • Author(s): Chuck Short
  • Date: 2010-06-21 15:31:05 UTC
  • mfrom: (1.1.3 upstream)
  • mto: This revision was merged to the branch mainline in revision 6.
  • Revision ID: james.westby@ubuntu.com-20100621153105-pbbz3t6nyrf9t2zq
Tags: upstream-5.1.48
Import upstream version 5.1.48

Show diffs side-by-side

added added

removed removed

Lines of Context:
sql/sql_delete.cc
248
248
        free_underlaid_joins(thd, &thd->lex->select_lex);
249
249
        DBUG_RETURN(TRUE);
250
250
      }
 
251
      thd->examined_row_count+= examined_rows;
251
252
      /*
252
253
        Filesort has already found and selected the rows we want to delete,
253
254
        so we don't need the where clause
265
266
    free_underlaid_joins(thd, select_lex);
266
267
    DBUG_RETURN(TRUE);
267
268
  }
268
 
  if (usable_index==MAX_KEY)
 
269
  if (usable_index==MAX_KEY || (select && select->quick))
269
270
    init_read_record(&info, thd, table, select, 1, 1, FALSE);
270
271
  else
271
272
    init_read_record_idx(&info, thd, table, 1, usable_index);
304
305
  while (!(error=info.read_record(&info)) && !thd->killed &&
305
306
         ! thd->is_error())
306
307
  {
 
308
    thd->examined_row_count++;
307
309
    // thd->is_error() is tested to disallow delete row on error
308
310
    if (!(select && select->skip_record())&& ! thd->is_error() )
309
311
    {