bzr push into mysql-trunk-pfs-tuning branch (marc.alff:3504 to 3505)

[Marc Alff]

 3505 Marc Alff	2012-05-07
      Windows build break (perf tests)

    modified:
      storage/perfschema/unittest/pfs_benchmark_helper.cc
 3504 Marc Alff	2012-05-07 [merge]
      Merge mysql-trunk --> mysql-trunk-pfs-tuning
      Attempt to fix unit test build break on windows

    modified:
      mysql-test/suite/innodb/r/innodb_stats_drop_locked.result
      storage/innobase/dict/dict0stats.cc
      storage/perfschema/unittest/pfs_benchmark_helper.cc
=== modified file 'storage/perfschema/unittest/pfs_benchmark_helper.cc'
--- a/storage/perfschema/unittest/pfs_benchmark_helper.cc	2012-05-07 07:38:35 +0000
+++ b/storage/perfschema/unittest/pfs_benchmark_helper.cc	2012-05-07 07:56:15 +0000
@@ -22,6 +22,10 @@ unsigned long long get_work_done()
 #include "my_pthread.h"
 
 #if defined(__WIN__)
+
+#ifdef LATER
+// does not work, not stubbing this then.
+
 /*
   See include/my_pthread.h
 */
@@ -34,6 +38,8 @@ __declspec(dllexport) void __stdcall Lea
 {
   return;
 }
+#endif
+
 #else
 
 int pthread_mutex_lock(pthread_mutex_t *)

No bundle (reason: useless for push emails).