← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/sql_update.cc

  • Committer: Brian Aker
  • Date: 2008-10-08 02:28:58 UTC
  • mfrom: (489.1.13 codestyle)
  • Revision ID: brian@tangent.org-20081008022858-ea8esagkxmn0dupc
Merge of Monty's work.

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/sql_update.cc
195
195
    return(1);
196
196
 
197
197
  DRIZZLE_UPDATE_START();
198
 
  thd_proc_info(thd, "init");
 
198
  thd->set_proc_info("init");
199
199
  table= table_list->table;
200
200
 
201
201
  /* Calculate "table->covering_keys" based on the WHERE */
389
389
      else
390
390
        init_read_record_idx(&info, thd, table, 1, used_index);
391
391
 
392
 
      thd_proc_info(thd, "Searching rows for update");
 
392
      thd->set_proc_info("Searching rows for update");
393
393
      ha_rows tmp_limit= limit;
394
394
 
395
395
      while (!(error=info.read_record(&info)) && !thd->killed)
458
458
  thd->count_cuted_fields= ignore ? CHECK_FIELD_WARN
459
459
                                  : CHECK_FIELD_ERROR_FOR_NULL;
460
460
  thd->cuted_fields=0L;
461
 
  thd_proc_info(thd, "Updating");
 
461
  thd->set_proc_info("Updating");
462
462
 
463
463
  transactional_table= table->file->has_transactions();
464
464
  thd->abort_on_warning= test(!ignore);
650
650
 
651
651
  end_read_record(&info);
652
652
  delete select;
653
 
  thd_proc_info(thd, "end");
 
653
  thd->set_proc_info("end");
654
654
  table->file->extra(HA_EXTRA_NO_IGNORE_DUP_KEY);
655
655
 
656
656
  /*
1033
1033
  
1034
1034
  thd->count_cuted_fields= CHECK_FIELD_WARN;
1035
1035
  thd->cuted_fields=0L;
1036
 
  thd_proc_info(thd, "updating main table");
 
1036
  thd->set_proc_info("updating main table");
1037
1037
 
1038
1038
  tables_to_update= get_table_map(fields);
1039
1039
 
1670
1670
  uint64_t id;
1671
1671
  THD::killed_state killed_status= THD::NOT_KILLED;
1672
1672
  
1673
 
  thd_proc_info(thd, "updating reference tables");
 
1673
  thd->set_proc_info("updating reference tables");
1674
1674
 
1675
1675
  /* 
1676
1676
     Does updates for the last n - 1 tables, returns 0 if ok;
1682
1682
    later carried out killing should not affect binlogging.
1683
1683
  */
1684
1684
  killed_status= (local_error == 0)? THD::NOT_KILLED : thd->killed;
1685
 
  thd_proc_info(thd, "end");
 
1685
  thd->set_proc_info("end");
1686
1686
 
1687
1687
  /*
1688
1688
    Write the SQL statement to the binlog if we updated