← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/sql_update.cc

  • Committer: Lee Bieber
  • Date: 2011-01-09 23:23:37 UTC
  • mfrom: (2067.1.2 build)
  • Revision ID: kalebral@gmail.com-20110109232337-bobns3ndxf1qerfw
Merge Andrews - fix bug 673833: Embedded SELECT inside UPDATE or DELETE can timeout without error
Merge Andrews - fix bug 700099: serveral issues with InnoDB settings

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/sql_update.cc
206
206
    fix_inner_refs(session, all_fields, select_lex, select_lex->ref_pointer_array))
207
207
  {
208
208
    DRIZZLE_UPDATE_DONE(1, 0, 0);
209
 
    return -1;
 
209
    return 1;
210
210
  }
211
211
 
212
212
  if (conds)
246
246
     */
247
247
    session->main_da.reset_diagnostics_area();
248
248
    free_underlaid_joins(session, select_lex);
249
 
    if (error)
 
249
    if (error || session->is_error())
250
250
    {
251
251
      DRIZZLE_UPDATE_DONE(1, 0, 0);
252
252
      return 1;