From: Marc Alff
Date: September 28 2010 12:24am
Subject: bzr push into mysql-5.5-bugfixing branch (marc.alff:3203 to 3204)
List-Archive: http://lists.mysql.com/commits/119209
Message-Id: <201009280025.o8RKbqcO015103@rcsinet15.oracle.com>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============3604022485683410003=="

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

 3204 Marc Alff	2010-09-27
      Added missing paterns

    modified:
      mysql-test/valgrind.supp
 3203 Mats Kindahl	2010-09-23
      Merging into mysql-5.5-bugfixing.

    modified:
      mysql-test/r/type_newdecimal.result
      mysql-test/t/type_newdecimal.test
      sql/field.cc
=== modified file 'mysql-test/valgrind.supp'
--- a/mysql-test/valgrind.supp	2010-09-09 21:33:35 +0000
+++ b/mysql-test/valgrind.supp	2010-09-28 00:23:54 +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
+}
+


--===============3604022485683410003==
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:///Users/malff/BZR_TREE/mysql-5.5-bugfixing/
# testament_sha1: 1a786eed62b89dc65f899fd32143326490a0bd3b
# timestamp: 2010-09-27 18:24:40 -0600
# base_revision_id: mats.kindahl@stripped\
#   1755fy9wcv22qfd5
# 
# Begin bundle
IyBCYXphYXIgcmV2aXNpb24gYnVuZGxlIHY0CiMKQlpoOTFBWSZTWVF17fYAAX7fgAAQUGP/93MO
SBC////6UAOnuaJWTTNkgkkEmNCTaZMVPNRqeTUyaPSbUDRk9QwAAAAAAAAAACSIJkmIyTao/UxM
iGNQDQGgDAAAAAAAAAAAJKSbVNk9KemFPap4p6aj0anqMIAaBo6tXsOnvWam1fXx9fR3W8rtwclS
52DpPdDo9LWlPdKZhvz9zS+Z/PN7QOk9PTXsejoNZ6t+GGY3Tft1S8BmFPZBROIijjePfnFNfmlq
LSaOJ4D0j6TlRzubHGV6GZ0NDRoN1C4khGDiHnxqKwYhYSqTUvFkEFEGHeylkLUTbSwR0tzMfr6f
1CMlOwxyty2Y6xtR8pLzKj87NVKmoPJfThx9dGJZkXWY+bhuTVgrN0h+OBf7KZVC1qmCjb2uKW3h
IgHdRcr5SOqMlSO+rD9tYs0xYjn9IJ5ovwJSrN1eJ7Ngy1mToi/VlqGwGmYDUf2Cqb8+5F42q64n
ly50tFtiqLZlMd02+hoNFStq20HkJDo3X5KylSITlcjq8tr7MGmVVFVS3GomiKkukVKriTR10Spq
hHkJyIsKmU+tjRcqKWbkqo0kOEO2Ea1zaVGLC5bpEbKxTVahQKzboZ+HKuraoeHl003JkspaKmTH
6d5KJF8rde39nvPoPFvezXfBGdcJeMWmJ7tx3saDsC0px7Z0i6nSYTtClQ5AblvKR74Iqv3MBHpR
wE/Bo1sAW9/BpXtuMqSQr64+r2MlUg0UFpJtxMNvOcofnj3b/buj8Kb4JHxSMH9VMbq1sroJclFR
TbIKLwnPP3mj99pxPlS/WLNC2dNo75aN+3VdUzqYtBqQt3cP9jDaRlu2GlnODW6PrZp+blvS870y
uyy69bvnnBvCgZxVKibDsMthhdCIFLdUw5BnpP9v4Hp+c874HIZHcoG3mVofxuPtkWrAvE3ai2o0
wO8mK1aZ0eXbguMVgXc5kyVsxciAsiWAQsTpSinlqgbgcwYhsKGOhsJ6BRa7IVsY8N6sLrQkCSAN
SiaYwJDAvq3SoT2GtxvLX9qRfjbxb7nkM/GKdTufYczhqlI7GOGNJp0Mc6JyKRBgmaUkOZMjt1GJ
HEFE8GNsC/qkd4Uh9HKz5nhBYb1bdgzJoFVGjAJp/Rdgrx/xGyyyUgDGAjTR0Xc8ihjcrQhujlCI
RVRYO05N36ptuaOqw6whVejlybn2F2FRi4PUmeOu938SHB44N14jYw2376yQVBMoOUX6Ra/h7Cbe
5kUBu3LDI8itYI1HNNwgZ9grP4a6A5XsxaqduktefgXmJ+MJJ2FSxFxP+LuSKcKEgouvb7A=


--===============3604022485683410003==--