From: Marc Alff
Date: September 28 2010 12:34am
Subject: bzr push into mysql-trunk-bugfixing branch (marc.alff:3275 to 3276)
List-Archive: http://lists.mysql.com/commits/119212
Message-Id: <20100928003414.8066545E80@linux-su11.site>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============5673140616925769969=="

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

 3276 Marc Alff	2010-09-27 [merge]
      Merge mysql-5.5-bugfixing --> mysql-trunk-bugfixing

    modified:
      mysql-test/valgrind.supp
 3275 Konstantin Osipov	2010-09-24 [merge]
      Merge trunk -> trunk-bugfixing.

    modified:
      client/CMakeLists.txt
      include/CMakeLists.txt
      include/Makefile.am
      include/atomic/x86-gcc.h
      mysql-test/r/sp-destruct.result
      mysql-test/t/sp-destruct.test
      scripts/CMakeLists.txt
      scripts/make_win_bin_dist
      sql/mdl.cc
      sql/mdl.h
      sql/sp.cc
      sql/sql_base.cc
      sql/sql_base.h
      sql/table.cc
=== modified file 'mysql-test/valgrind.supp'
--- a/mysql-test/valgrind.supp	2010-09-14 21:51:35 +0000
+++ b/mysql-test/valgrind.supp	2010-09-28 00:32:57 +0000
@@ -770,3 +770,13 @@
    fun:lf_hash_insert
 }
 
+{
+   missing shutdown_performance_schema 3
+   Memcheck:Leak
+   fun:malloc
+   fun:my_malloc
+   fun:initialize_bucket
+   fun:lf_hash_search
+   fun:_Z19find_or_create_fileP10PFS_threadP14PFS_file_classPKcj
+}
+


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

# Bazaar merge directive format 2 (Bazaar 0.90)
# revision_id: marc.alff@stripped
# target_branch: file:///home/malff/BZR_TREE/mysql-trunk-bugfixing-\
#   merge/
# testament_sha1: 9fe116bb5e617625d990e918a208c8248889f085
# timestamp: 2010-09-27 18:34:14 -0600
# source_branch: file:///home/malff/BZR_TREE/mysql-5.5-bugfixing/
# base_revision_id: kostja@stripped
# 
# Begin bundle
IyBCYXphYXIgcmV2aXNpb24gYnVuZGxlIHY0CiMKQlpoOTFBWSZTWSZ2Z2oAAv5fgAAQUGP/93MO
SBC////6UAXt4MsjhOVXNSgABKSNBJ7SD1Gyk2jU9CaG09UYmhoPSCUSnknoxGKnqMT1NGmgAAAA
EkjSEymym0GoaHpMnqANDQA0GAAAAAAAAAAASSBAIwRPIZTIyTE00T1D0g0dlUuCnncfxiGipmw3
9eUXZ4U58dTIkEVStUZJGytZG83o6WdKm3QVzvAIHtuC13JD7b73hKEYLcTnBuLuA9HwNDS0/LF7
AzBoTnyOLFFj6AznAqbmiuSmD5AW4+TtEvGzMygRZieBAlcUmQsg1DGRVHMEZo2JhB/S2C3ELIuc
6m2o49LHUIGIaDPbMA5hEBXDgEzpE9Ii5hTg5wQnCVITKdpHRhIgKIsByKVAaA1VHQULBEzak4C3
seFXTUfkyyQ4zIzASplHkjCpuVylDQiwhTKJ9hIkb2BFsMhmYiTzpQGtIYNytvXBM8MZpB+ZiS5D
QtwNrRO+2cEp9z6wgZvC3/FJbBFSc6epQguAmKtmXU4BMZ5ycCKUq6VfZKZlneSasVJLTUwQbWUu
w8GoEVBEN4OaZA5FBZHIExCNJMRVgh01gMK0I4vByYRF5vxmrDRPxuJn0BcDVxebhXrqvIRtMGvT
ajcDxRgDIw247Q23U14n6PBmK9gjIIqpULIV0wUwem7ykozB1EliKiiZrhOgxrgbIFYNRunVc9da
TJYooYBZIKRD+KtEmJHmWSP0ObNbkflo3bbr1dhUbQRb9j+MLiVgBYGNAnNKVHb7xmmFGPjMWhtS
+y3VknCIYuEqqTiwAlbKGBk5g7PJMB6maGboSucijdjRm1owWBAmK545OJgNqqIBCZ84wmKBpwnS
okMewcj0MCgqtZkPPM+Dt9TQ3phByWlhQtiZDHy76qKiz7MatXUvmmIKvxVDxaB4Uro4SKlCeqwK
lSAUWaw0hZHxR0IZkRC0cNOGjxcTImdJYAhAS4zlZWRTnxXeQBFN4j8COXlFRi5HPj7ecg1x9Qdl
7eIPUPHILQ1G5gWjy4TvEQY4MYUw2tDyyNs5NYFKy2vZtP98InKrOCSOohWD/upG0sFlYUB6Vl6k
iQmMo9pRJpAdQHO9WCVV1geYXUEbhC06KQE0YY6LAjW3diJq5bDnLso1jDQxyaLFCVF+H9pjnB5a
Kw5Z8RaOyhXxlKi7jYQKMPkiGPxsDtEwrM2Y5prsrucQ48Y9aAMiAqKwkZlwWcs+TBk7ulMCK24S
5p4OJGLIG82GB6m28NVzrsBkWLISTDNm8gnrQRc0ewYBOL7GYYC0W8WaYRETtUGNoXwPIJguWIa0
fY7zNHiRTJu47j3LRMbCJaGoDg40C1pOyqtsGWXfeQJGsJgMAOktYqBzSZLhXLARSdc5VDHMTdGy
S91SLiHcLFaByAvAvHAc1VEOw5JDCxJ/YvBLMYvKiwKRx7CFZfTqx+T4GchhwztSCHKVZxeXB0NS
skRDquY6TDTl5ROOTAyGD8RKFFAQGSkNIrrEPYTCOnbA4BLgCUg9Bg0ILMWX/JI70qxebhRV1/qH
pIXA8Bbz0y4DDCaIbajmqOCUxSU+6mFiIzCIdQY+61MNQnSSxHpI00cI2HU3BOGNgqRPzhiPIQGE
yiqBG17E0hvOqTGLDQKpjUB5QcGBux2GOB0FXsKBgtWxLmvoJ0JXG0cOO8HmriFo3IwBjB5Zs8Cw
KlUJkq0txOpPFMPuEbuP8CGDIXiPKk5FI5LSsWit4Dw6haLIREPJdV7p7iIczARb8BvDfUl5mAww
YqrW4MR4uwi8Q8pgVA7IrFmI6n/i7kinChIEzsztQA==


--===============5673140616925769969==--