← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/sql_delete.cc

  • Committer: Lee Bieber
  • Date: 2011-01-09 23:01:15 UTC
  • mfrom: (2062.4.1 trunk-bug-673833)
  • mto: This revision was merged to the branch mainline in revision 2068.
  • Revision ID: kalebral@gmail.com-20110109230115-dleqp2aecfjptbsi
Merge Andrews - fix bug 673833: Embedded SELECT inside UPDATE or DELETE can timeout without error

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/sql_delete.cc
173
173
    delete select;
174
174
    free_underlaid_joins(session, select_lex);
175
175
    session->row_count_func= 0;
 
176
    if (session->is_error())
 
177
      return true;
176
178
    DRIZZLE_DELETE_DONE(0, 0);
177
179
    /**
178
180
     * Resetting the Diagnostic area to prevent
390
392
 
391
393
  if (select_lex->inner_refs_list.elements &&
392
394
    fix_inner_refs(session, all_fields, select_lex, select_lex->ref_pointer_array))
393
 
    return(-1);
 
395
    return(true);
394
396
 
395
397
  return(false);
396
398
}