← 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: 2010-11-08 20:00:45 UTC
  • mto: (1921.1.1 trunk)
  • mto: This revision was merged to the branch mainline in revision 1916.
  • Revision ID: brian@tangent.org-20101108200045-wgysfvli5mtduszd
Enapsulate Kill.

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/sql_update.cc
148
148
  Select_Lex    *select_lex= &session->lex->select_lex;
149
149
  uint64_t     id;
150
150
  List<Item> all_fields;
151
 
  Session::killed_state killed_status= Session::NOT_KILLED;
 
151
  Session::killed_state_t killed_status= Session::NOT_KILLED;
152
152
 
153
153
  DRIZZLE_UPDATE_START(session->query.c_str());
154
154
  if (session->openTablesLock(table_list))
374
374
      session->set_proc_info("Searching rows for update");
375
375
      ha_rows tmp_limit= limit;
376
376
 
377
 
      while (!(error=info.read_record(&info)) && !session->killed)
 
377
      while (not(error= info.read_record(&info)) && not session->getKilled())
378
378
      {
379
379
        if (!(select && select->skip_record()))
380
380
        {
397
397
        else
398
398
          table->cursor->unlock_row();
399
399
      }
400
 
      if (session->killed && !error)
 
400
      if (session->getKilled() && not error)
401
401
        error= 1;                               // Aborted
402
402
      limit= tmp_limit;
403
403
      table->cursor->try_semi_consistent_read(0);
467
467
  can_compare_record= (! (table->cursor->getEngine()->check_flag(HTON_BIT_PARTIAL_COLUMN_READ)) ||
468
468
                       table->write_set->is_subset_of(*table->read_set));
469
469
 
470
 
  while (! (error=info.read_record(&info)) && !session->killed)
 
470
  while (not (error=info.read_record(&info)) && not session->getKilled())
471
471
  {
472
 
    if (! (select && select->skip_record()))
 
472
    if (not (select && select->skip_record()))
473
473
    {
474
474
      if (table->cursor->was_semi_consistent_read())
475
475
        continue;  /* repeat the read of the same row if it still exists */
546
546
    It's assumed that if an error was set in combination with an effective
547
547
    killed status then the error is due to killing.
548
548
  */
549
 
  killed_status= session->killed; // get the status of the volatile
 
549
  killed_status= session->getKilled(); // get the status of the volatile
550
550
  // simulated killing after the loop must be ineffective for binlogging
551
551
  error= (killed_status == Session::NOT_KILLED)?  error : 1;
552
552