bzr push into mysql-next-mr-wl5569 branch (alfranio.correia:3227 to 3228)

[Alfranio Correia]

 3228 Alfranio Correia	2010-12-04
      Added mutex to the checkpoint_routine.

    modified:
      sql/rpl_slave.cc
 3227 Alfranio Correia	2010-12-03
      Implemented periodic checkpoint if parallel slave is enabled.

    modified:
      include/my_pthread.h
      sql/binlog.cc
      sql/binlog.h
      sql/rpl_rli.cc
      sql/rpl_rli.h
      sql/rpl_slave.cc
=== modified file 'sql/rpl_slave.cc'
--- a/sql/rpl_slave.cc	2010-12-03 16:56:11 +0000
+++ b/sql/rpl_slave.cc	2010-12-04 15:45:02 +0000
@@ -3598,8 +3598,8 @@ bool checkpoint_routine(Relay_log_info *
   bool error= FALSE;
 
   DBUG_ENTER("checkpoint_routine");
- 
-  // ANDREI LOCKS?
+
+  mysql_mutex_lock(&rli->data_lock); 
 
   uint i;
   rli->gaq->move_queue_head(&rli->workers);
@@ -3618,6 +3618,8 @@ bool checkpoint_routine(Relay_log_info *
 
   error= rli->flush_info(TRUE);
 
+  mysql_mutex_unlock(&rli->data_lock);
+
   // ANDREI NOTIFICATIONS?
   DBUG_RETURN(error);
 }


Attachment: [text/bzr-bundle] bzr/[e-mail]