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

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

 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
 3242 Andrei Elkin	2010-12-13
      wl#5569 MTS
      
      updating results for few tests.

    modified:
      mysql-test/r/mysqld--help-notwin.result
      mysql-test/r/mysqld--help-win.result
      mysql-test/suite/rpl/r/rpl_parallel.result
      mysql-test/suite/rpl/r/rpl_parallel_conflicts.result
      mysql-test/suite/sys_vars/r/all_vars.result
=== modified file 'sql/rpl_info.cc'
--- a/sql/rpl_info.cc	2010-12-08 01:30:32 +0000
+++ b/sql/rpl_info.cc	2010-12-13 15:57:01 +0000
@@ -92,7 +92,7 @@ bool Rpl_info_coordinator::register_mute
                                NUMBER_MUTEX_INFO);
 
     PSI_server->register_cond(description, cond_info,
-                              NUMBER_MUTEX_INFO);
+                              NUMBER_COND_INFO);
   }
 
   mysql_mutex_init(key_mutex_info[RUN_LOCK_IDX], &run_lock,


--===============1805868459==
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: 1ff270570cc337634187adee9359473ca99acd21
# timestamp: 2010-12-13 17:57:25 +0200
# base_revision_id: andrei.elkin@stripped\
#   c5g6qczxtfbm2x7m
# 
# Begin bundle
IyBCYXphYXIgcmV2aXNpb24gYnVuZGxlIHY0CiMKQlpoOTFBWSZTWdI/PzwAAXF/gAAQABBZY///
fyOeAL////BQA02pb3dx6POu93CUQgmVPyYSPapmqep+pPaBTT9UGHpIP0p+qNBlCDSntqJ6aJk1
GyCADQ0AZAAyJMJoAU09GgmgGmQDQA0AGUo09A0IyaDaIAAAGgAAJJRkamp4ieTE1HpGQGmgAAAN
OGrWP9fAqiWpU7aHwAKtgr3sZQDI6cJVFX180ydDonVWBiOdn/fHbcvh6NbVTuUwQebaa7Ka4Wc5
VCPZ2LPtuEg3AjnlQFxurEXvEMsMrG4lCQqsEPdNHCuMFthzhjBZoBQAqSN/Jrv4LRvOhMUlMjAr
UiwPFOptAKvBlRYBS0OStGRSAhuIaymqDJCBU8sCDZAqTfRSIweq/KJ6Wrg4NfYAW6Y8jCBZuC3D
MbEGbVLANC7AVwUA2Jr0aTdF6hCBXdUIiZ81cKA+R+IS2wMC4IMaCcW1Ua5hSpsIq8rLqDISGdGp
Wn8bKXa8LnCRsR8RIgRxRBGaQrc4knarAYuaxh1spPOvwUl4tSvoIBdPquo1qlp0C0vecf0tuoov
UBkqtSdrs+sRTE3oF5DMw12T21UCK2TNUUvaBUr5EdMoeFKOSQQAc9J9lOwS89nOtil/jdZCId0k
aKq/r8Z5QbKGuzb9uuPXKXOaXPOqh96MD+4uLCoVNzgu4m6/5+yI7HoiE8RLO4LvGSqmCBNxeKzN
31lnQ9unJMeXcauz5YfcwgLCFKtuAe5ikNO3FIPNKsRLM0hBIpEhSOhdCacLcFuOcFoPJDZZKImD
PAscgkoQM46BQS3QtFB0lNnCGiPerJIw5cXHvs2tNOpRo+Zen5r4Ig9eyVyzdWG0QhNyKl731121
DYg0wo62vWpPqpafBY08FiIpifn371j0g0vuVp3pvtQmht29qvCSZKamEMMZink9Ez8DEUq0cV6E
iZgnmWuf9zZJHUBoCvHHZgKwfGkUBz6y4IoA+MM6txJDG4u94jJhgMwjxAjWYhcp2CdMbRw4r4TQ
eJdO4FkQ8oCE0vYTZEIdK4TQd0xZUPZMpwZ9EpJNaCkDU42JHGBwpkol91dcKhQgsD8m08XFpZvX
SoJkjZrFRJlimJD8pCYVCbTwzl7dlsj9u1TeBQElbJqEUMJ7xgAuYQU6TROJSLwZ2W6mKoqSNQqY
bsIW30CIEwDEN2V92bCGTlB285tLKEdNzxQFUGOUNK3ql0CvpFXAhpX+LuSKcKEhpH5+eA==


--===============1805868459==--