List:Commits« Previous MessageNext Message »
From:Sujatha Sivakumar Date:April 16 2012 5:50am
Subject:bzr push into mysql-trunk branch (sujatha.sivakumar:3878 to 3879)
Bug#12662190
View as plain text  
 3879 Sujatha Sivakumar	2012-04-16
      Bug#12662190 - COM_COMMIT IS NOT INCREMENTED FROM THE BINARY LOGS ON SLAVE, COM_BEGIN IS
                  
      Follow up patch to make the fix work with both STS and MTS
            
      Earlier patch had two different increment statements which
      were added to increment COM_COMMIT global variable.
      One for STS mode and for MTS mode.
            
      The current patch removes those individual increment statements
      and the code to increment the global variable
      had been moved to "bool Xid_log_event::do_commit(THD *thd)" function.
            
      As this is a common commit function for both STS and MTS mode.

    modified:
      sql/log_event.cc
 3878 gopal.shankar@stripped	2012-04-13
      Post fix for failure in daily-trunk after push of Bug#11815557

    modified:
      mysql-test/extra/rpl_tests/rpl_stm_EE_err2.test
      mysql-test/suite/rpl/r/rpl_stm_EE_err2.result
=== modified file 'sql/log_event.cc'
--- a/sql/log_event.cc	2012-04-12 15:31:01 +0000
+++ b/sql/log_event.cc	2012-04-16 05:11:48 +0000
@@ -6917,6 +6917,12 @@ bool Xid_log_event::do_commit(THD *thd)
     error |= gtid_empty_group_log_and_cleanup(thd);
   }
 
+  /*
+    Increment the global status commit count variable
+  */
+  if (!error)
+    status_var_increment(thd->status_var.com_stat[SQLCOM_COMMIT]);
+
   return error;
 }
 
@@ -7027,12 +7033,6 @@ err:
   mysql_cond_broadcast(&rli_ptr->data_cond);
   mysql_mutex_unlock(&rli_ptr->data_lock);
 
-  /*
-    Increment the global status commit count variable
-  */
-  if (!error)
-    status_var_increment(thd->status_var.com_stat[SQLCOM_COMMIT]);
-
   return error;
 }
 

No bundle (reason: useless for push emails).
Thread
bzr push into mysql-trunk branch (sujatha.sivakumar:3878 to 3879)Bug#12662190Sujatha Sivakumar20 Apr