From: Luis Soares
Date: September 20 2010 11:00pm
Subject: bzr commit into mysql-next-mr-bugfixing branch (luis.soares:3295) Bug#56882
List-Archive: http://lists.mysql.com/commits/118653
X-Bug: 56882
Message-Id: <201009202302.o8K7wQmc031735@rcsinet15.oracle.com>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============6132842944261142951=="

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

#At file:///home/lsoares/Workspace/bzr/work/bugfixing/56882/mysql-next-mr-bugfixing/ based on revid:alfranio.correia@stripped

 3295 Luis Soares	2010-09-21
      BUG#56882: binlog_base64_flag fails on valgrind and win debug 
                 max platforms
      
      In some cases, the variable err in mysql_client_binlog_statement
      would not be initialized but still some conditional jumps would
      rely on its value. This is for instance the case when a BINLOG
      event is truncated and it returns an error. In this case the
      'err' variable is not initialized at that time, but we jump to
      the label 'end' and then check the following condition: 
      
       if ((error || err) && ... )
      
      This makes valgrind complain that there is a conditional jump or
      move depending on an uninitialized value.
      
      We fix this by initializing the variable err to 0.

    modified:
      sql/sql_binlog.cc
=== modified file 'sql/sql_binlog.cc'
--- a/sql/sql_binlog.cc	2010-09-01 02:51:08 +0000
+++ b/sql/sql_binlog.cc	2010-09-20 23:00:48 +0000
@@ -147,7 +147,7 @@ void mysql_client_binlog_statement(THD* 
     Allocation
   */
 
-  int err;
+  int err= 0;
   Relay_log_info *rli;
   rli= thd->rli_fake;
   if (!rli && (rli= thd->rli_fake= new Relay_log_info(FALSE)))


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

# Bazaar merge directive format 2 (Bazaar 0.90)
# revision_id: luis.soares@stripped
# target_branch: file:///home/lsoares/Workspace/bzr/work/bugfixing\
#   /56882/mysql-next-mr-bugfixing/
# testament_sha1: 01a3e62472efbb9033c984459247f4d626ebbace
# timestamp: 2010-09-21 00:00:55 +0100
# base_revision_id: alfranio.correia@stripped\
#   sxo39h0p2dc47omn
# 
# Begin bundle
IyBCYXphYXIgcmV2aXNpb24gYnVuZGxlIHY0CiMKQlpoOTFBWSZTWQiy7sEAAbhfgACQWef//1Kl
joC////0UATGeKotgoDQANCKn6EnmlPap41R6MTRD0gMjEaPJADmAAmTAAmEwTCGAIwANBNEwkDS
aehqAMQ0AABoNDmAAmTAAmEwTCGAIwAJJCaAAmIEntTKbTEImj1DTQG01EGEUdGao+H68Uv5Xt2I
Ok2rIhprFaq5kx87XcZbtyCEN9981Vtm9pmYwl1cCmZkMgZi71jQ4kBz9ZiGhL2CwQLfkc4y2xVn
FD425ZZ4wZc61Gz5ZnGbLay0kmyb9s0EZqoVJi9hpW0YJOdHA3nIWQRzn6NV2bLqO4IYLRwW0mmU
/RjnC66w/4Rvk5Z5EP96ml3M6q1K3nW518NmitiIuUIakpY1y7ZZEdj4DukXDvIUBwi5wjUyfFwp
XvRMJmHQLXDxEaE9USSPxUFQy5+sRHZnY2bDZx7DlnUTxhKS4jOeuRJgF/TRBcDhZhu3cEjOk7DG
wY4PkO4FtQZEEwxiJk3m1/IjqjvoweGOF61/cXYkwFniBY68gJHsGJx15L0eMmhcbnoH4raaxaQY
oXRErQrJyiKD7xirEhhQS44k85rwiT9zl7VymFnqxSTKcn1O1BPv1WQoMDHOd90a7lA1lxZZPBtJ
/grSmlWvrKjCpytFYOFBo7AzdbTLVEpKVCyhUzMgf3upx4FCqFKBcjxKqd6slVDRb5sL6CLKRvNh
UBCo3c4s39W5K9OSp93bSWoitkgBmDkq9l4fOeCDGHDFY5GHrzlSealTSE3k8loN5AOfgea7VuVf
poIskSseEz99xkvwUoYfheNO5YOWnwtR2AnXUxayjIc+q55s44c85tpeQr6Ht1ddjBOZypp+ci4B
WlUu1M/mSrfd9ExEf1bhGax7hF06RdEHLXLMwzM5nMeV/GTjHvrmUqbW9VXGxWF1H0OJQDyfj+Di
d5y1L8Qv1Q94Z6OHT7yKR4kwuF/JqXYFHYl8d6rAcjAJdHUkEQcdeuINLRpW45LFUF0PdcezigY7
nP55bdI8mcmW02Tz93gUsfVqp8YuSqrHdGDKpQk2mhlq6dBSFuMp2Jy/73SndaLy7sJAtk4qw3EO
kuDHkmY83ofDVOeHjkm3hYBU/q8Pc+2aeuwu4NE9MzXYbE10mvWak/JlC1n0HeFkk2z6zFjdUMfH
hroithawx6d0/iMww5LoDpQtTvHIozDiNkZkq3nBVFG3eFZ8zloaRLPsPC8HuB4WYJczIl+B4tgI
cQKUPZD99kmxFkjRP4PzG4aYUJF+5ezymiMzzbjEOt95PMNN2lHVzpA0qVPIzVREwT0UMDJ6AGxV
kcnAMaRenoJTypHzsyTMmVngSvXiqCr33JUa0c6dyRIN8k1yqScu05CVx7iLgeEVo9cDPzL7mVq/
RV7mZQNc3J8lW58rYirpFH1o1Nuc5iZ1ae4S+OK+klgorSdCuue4eo9dCgqV7eVWyXCwoRKmO5nR
ZYPgUMLYz4zOekyT8nWrBmNK5QaVdrNaWJ06NP1c4dWX0y1h3tKtZG7JzNfnBM/we4cYpnmNRnSK
D0bmF6vqqDOmNpBOHhWDnyPTsLdNlpwPq5Ks+Rl6K2y12gs6TvkSouwTBkQrYkbO8zyuNbrlSF9u
px5dDkSniXldIFMx7X/+LuSKcKEgEWXdgg==


--===============6132842944261142951==--