List:Commits« Previous MessageNext Message »
From:marko.makela Date:September 26 2011 7:30am
Subject:bzr push into mysql-5.5 branch (marko.makela:3547 to 3548)
View as plain text  
 3548 Marko Mäkelä	2011-09-26 [merge]
      Merge mysql-5.1 to mysql-5.5.

    modified:
      storage/innobase/row/row0purge.c
 3547 Luis Soares	2011-09-23 [merge]
      BUG#13001711
      
      Automerged bundle from committed and approved cset.

    modified:
      sql/sql_lex.cc
=== modified file 'storage/innobase/row/row0purge.c'
--- a/storage/innobase/row/row0purge.c	revid:luis.soares@oracle.com-20110923113908-ubd104g2klf0hglx
+++ b/storage/innobase/row/row0purge.c	revid:marko.makela@stripped0926070842-3mkoiyubtzzmsi0f
@@ -515,7 +515,7 @@ row_purge_upd_exist_or_extern_func(
 
 	ut_ad(node);
 
-	if ((node->rec_type == TRX_UNDO_UPD_DEL_REC)
+	if (node->rec_type == TRX_UNDO_UPD_DEL_REC
 	    || (node->cmpl_info & UPD_NODE_NO_ORD_CHANGE)) {
 
 		goto skip_secondaries;

No bundle (reason: useless for push emails).
Thread
bzr push into mysql-5.5 branch (marko.makela:3547 to 3548) marko.makela26 Sep