From: Andrei Elkin
Date: December 13 2010 4:53pm
Subject: bzr push into mysql-next-mr-wl5569 branch (andrei.elkin:3243 to 3244) WL#5569
List-Archive: http://lists.mysql.com/commits/126690
Message-Id: <201012131653.oBDGrrnm016861@mysql1000.dsl.inet.fi>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============0364773874=="

--===============0364773874==
MIME-Version: 1.0
Content-Type: text/plain; charset="us-ascii"
Content-Transfer-Encoding: 7bit
Content-Disposition: inline

 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
 3243 Andrei Elkin	2010-12-13
      wl#5569 MTS
      
      
      fixing a set of valgrind warning cauased by a c&p

    modified:
      sql/rpl_info.cc
=== 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.
    */


--===============0364773874==
MIME-Version: 1.0
Content-Type: text/bzr-bundle; charset="us-ascii";
	name="bzr/andrei.elkin@stripped"
Content-Transfer-Encoding: 7bit
Content-Disposition: inline

# Bazaar merge directive format 2 (Bazaar 0.90)
# revision_id: andrei.elkin@stripped
# target_branch: file:///home/andrei/MySQL/BZR/2a-23May/WL/mysql-next-\
#   mr-wl5569/
# testament_sha1: 22516546db88dccb3bd1c8bb3360cee2380b9d8e
# timestamp: 2010-12-13 18:53:53 +0200
# base_revision_id: andrei.elkin@stripped\
#   6j4wv6d28ymswzaa
# 
# Begin bundle
IyBCYXphYXIgcmV2aXNpb24gYnVuZGxlIHY0CiMKQlpoOTFBWSZTWfKIMTwAAgdfgAAQWGP/93IC
DAD////wUAR5eaAR7uU23dqISUk1MjyjzJPVPEyn6p6Ymmo0A9IAYAAAAAaDQBoBoBKIDRTRoA1M
QNNAxMhpoAiomSm00j0mNTZGoaaaNBoAAEkinpoaDSYTTSPQp6Kek2oMammja8dmg4+HLaNiyZGp
nvYlZGi7QqFBSjPe6OEvjCqqKvLfzhJaLVbJaX35vealrwnDTw37+PP9gPdDKfSnKTkgoaouDoVt
Y0ogVbc0amINMLJCQ5oVhrLSdbC2FjNdd4H3DbQ2MoZrYSZAYltPAtzIziAzJmcGhqO44pyFQJMx
lW8ebl48oHDxgpDhBVDtlGEb3aqQCBrcgnqxIuM+ahfKjrYyaqCYSZefC3RVGMEii+Yfyrd7XF6q
pHAXYd9s4lhTIyYN7QLeXGm8CuX7gzIXGBid74nKDkiAw9jE0Ow457RsMJmJzdFSs5ORzmWmzUnQ
zPIBj4KuSbiUFY9I1AqEOouKC6kcULlcZB+DmS4DBlGp6daQsOcLiLh6ixDH8F5+SkxXkZFzF9tA
0iQEDAgX35/xvWmRt33iiwrx331oFKA+IxMx9z0JGUWsicMSRMsteBQeppiQTRDMwPymKqjkbqww
OZMtWZpP1pORlSZrLIKhiskOOx7ECkxrZieqsUq6LLuoFUx1apq2vxTVxQlKUculImG4xlpAnhWG
DAMwWyEm04LKrkmOBZLBGQlNWx7ky7Cp2Gd4oZOR5xESmarKqKq83QOnR075FE3XCbYBb27qZjRM
SVwsOo/mUJF9fCsWzbTAqIZZpv3ZzHK5NRrYEfmWOq2xc4LCYxeliRlRgUjOwxyIHC0loO4pzO33
4pMct8xLjicQ410H0WvXWgZhLgJT86YAWEWzMO071FiIQDuDuCGmPIPLtfNPSUfEvQ7MAZ61jr3U
ng6F4/kRsikJEZUF8/fv3S3NY71HpKnk7czbpEXiWwG3pweus4eW2xFF9CO2EMw65TNDhfr1Nw0V
E1gex3JjczF547xgPh/ZWKskU3GnRddBthWeoHvI4mtZkYiwYkcNhDN1gb/xIdhi5286j1LhmYSV
yQRv993VRurRxRdlNGV8x6xGk5cXJ5KVwJUlYifRbhSA+aKiMA6CqJCTB/3pMTfERLXxIl/SF3C0
ShrsJ6SIS8ixmSJn1I+oxtFHCIuwZ4j+JnkLRVMhRMxk61pgEHjvLCim1WKQ4QoP0XWilc3L2sr+
g3kLHNhgeoXnDmWiltEp9z1PAFitMRcBdVDS5uVQ1aJ96ueK5emhq24bCI1ug5i0tJ0Y/GQzHctk
H/5fLqBLaMdL9Cxi87oYqDWZ92Zol1mrVi6K2329h7x4YHmOffWHbj8yrLpceDAC5Fitahgr+ZwP
BsWa/sA+v5G5UsfLsY3rZFxyI59MDc2PoBbtK11GF7uPhns3gaXkuMjTID/F3JFOFCQ8ogxPAA==


--===============0364773874==--