← Back to branch summary

~seppo-jaakola/+junk/group_commit

« back to all changes in this revision

Viewing changes to sql/sql_parse.cc

  • Committer: Seppo Jaakola
  • Date: 2012-09-08 20:12:18 UTC
  • Revision ID: seppo.jaakola@codership.com-20120908201218-t1a405e3vuw1pz25
References: lp1039514 - RSU fixes
enabling RSU processor to abort conflicting local transactions

Show diffs side-by-side

added added

removed removed

Lines of Context:
sql/sql_parse.cc
8210
8210
  THD *bf_thd     = (THD *) bf_thd_ptr;
8211
8211
  DBUG_ENTER("wsrep_abort_thd");
8212
8212
 
8213
 
  if ( (WSREP(bf_thd) || 
8214
 
        (WSREP_ON && bf_thd->wsrep_exec_mode == TOTAL_ORDER)) && victim_thd)
 
8213
  if ( (WSREP(bf_thd) ||
 
8214
         ( (WSREP_ON || wsrep_OSU_method_options == WSREP_OSU_RSU) &&  
 
8215
           bf_thd->wsrep_exec_mode == TOTAL_ORDER) )               &&
 
8216
       victim_thd)
8215
8217
  {
8216
8218
    WSREP_DEBUG("wsrep_abort_thd, by: %llu, victim: %llu", (bf_thd) ?
8217
8219
                (long long)bf_thd->real_id : 0, (long long)victim_thd->real_id);