← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/sql_delete.cc

  • Committer: Monty Taylor
  • Date: 2008-10-07 19:30:18 UTC
  • mfrom: (322.2.8 stdize-code)
  • mto: This revision was merged to the branch mainline in revision 491.
  • Revision ID: monty@inaugust.com-20081007193018-22fhaywc990akeqa
Merged code from Mats that I should have merged a while ago.

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/sql_delete.cc
56
56
    my_error(ER_VIEW_DELETE_MERGE_VIEW, MYF(0), "", "");
57
57
    return(true);
58
58
  }
59
 
  thd_proc_info(thd, "init");
 
59
  thd->set_proc_info("init");
60
60
  table->map=1;
61
61
 
62
62
  if (mysql_prepare_delete(thd, table_list, &conds))
235
235
  else
236
236
    init_read_record_idx(&info, thd, table, 1, usable_index);
237
237
 
238
 
  thd_proc_info(thd, "updating");
 
238
  thd->set_proc_info("updating");
239
239
 
240
240
  will_batch= !table->file->start_bulk_delete();
241
241
 
284
284
      table->file->print_error(loc_error,MYF(0));
285
285
    error=1;
286
286
  }
287
 
  thd_proc_info(thd, "end");
 
287
  thd->set_proc_info("end");
288
288
  end_read_record(&info);
289
289
  if (options & OPTION_QUICK)
290
290
    (void) table->file->extra(HA_EXTRA_NORMAL);
508
508
  
509
509
  unit= u;
510
510
  do_delete= 1;
511
 
  thd_proc_info(thd, "deleting from main table");
 
511
  thd->set_proc_info("deleting from main table");
512
512
  return(0);
513
513
}
514
514
 
785
785
bool multi_delete::send_eof()
786
786
{
787
787
  THD::killed_state killed_status= THD::NOT_KILLED;
788
 
  thd_proc_info(thd, "deleting from reference tables");
 
788
  thd->set_proc_info("deleting from reference tables");
789
789
 
790
790
  /* Does deletes for the last n - 1 tables, returns 0 if ok */
791
791
  int local_error= do_deletes();                // returns 0 if success
794
794
  local_error= local_error || error;
795
795
  killed_status= (local_error == 0)? THD::NOT_KILLED : thd->killed;
796
796
  /* reset used flags */
797
 
  thd_proc_info(thd, "end");
 
797
  thd->set_proc_info("end");
798
798
 
799
799
  if ((local_error == 0) || thd->transaction.stmt.modified_non_trans_table)
800
800
  {