bzr commit into mysql-next-mr-wl5569 branch (andrei.elkin:3244) WL#5569

[Andrei Elkin]

#At file:///home/andrei/MySQL/BZR/2a-23May/WL/mysql-next-mr-wl5569/ based on revid:andrei.elkin@stripped

 3244 Andrei Elkin	2010-12-13
      wl#5569 MTS
      
      
      fixing a valgrind stack cauased by extra pfs-keys/cond_var. Those are removed with Alfranio`s consent

    modified:
      sql/rpl_rli.cc
      sql/rpl_rli.h
=== modified file 'sql/rpl_rli.cc'
--- a/sql/rpl_rli.cc	2010-12-10 16:25:27 +0000
+++ b/sql/rpl_rli.cc	2010-12-13 16:53:32 +0000
@@ -85,8 +85,6 @@ Relay_log_info::Relay_log_info(bool is_s
   mysql_mutex_init(key_relay_log_info_log_space_lock,
                    &log_space_lock, MY_MUTEX_INIT_FAST);
   mysql_cond_init(key_relay_log_info_log_space_cond, &log_space_cond, NULL);
-  mysql_cond_init(key_checkpoint_start_cond, &checkpoint_start_cond, NULL);
-  mysql_cond_init(key_checkpoint_stop_cond, &checkpoint_stop_cond, NULL);
   relay_log.init_pthread_objects();
 
   DBUG_VOID_RETURN;
@@ -148,8 +146,6 @@ Relay_log_info::~Relay_log_info()
 {
   DBUG_ENTER("Relay_log_info::~Relay_log_info");
 
-  mysql_cond_destroy(&checkpoint_start_cond);
-  mysql_cond_destroy(&checkpoint_stop_cond);
   mysql_mutex_destroy(&log_space_lock);
   mysql_cond_destroy(&log_space_cond);
   relay_log.cleanup();

=== modified file 'sql/rpl_rli.h'
--- a/sql/rpl_rli.h	2010-12-10 16:25:27 +0000
+++ b/sql/rpl_rli.h	2010-12-13 16:53:32 +0000
@@ -108,9 +108,6 @@ public:
   THD* checkpoint_thd;
   bool checkpoint_running;
 
-  PSI_cond_key key_checkpoint_start_cond, key_checkpoint_stop_cond; 
-  mysql_cond_t checkpoint_start_cond, checkpoint_stop_cond; 
-
   /**
      Flags for the state of the replication.
    */


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