bzr push into mysql-trunk-bugfixing branch (marc.alff:3275 to 3276)

[Marc Alff]

 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
+}
+


Attachment: [text/bzr-bundle] bzr/[e-mail]