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

[Marc Alff]

 3460 Marc Alff	2012-01-06
      Windows build break

    modified:
      storage/perfschema/unittest/pfs_benchmark_helper.cc
 3459 Marc Alff	2012-01-05 [merge]
      Merge mysql-trunk --> mysql-trunk-pfs-tuning

    modified:
      mysql-test/collections/default.experimental
      mysql-test/r/distinct.result
      mysql-test/r/group_by.result
      mysql-test/r/having.result
      mysql-test/r/innodb_explain_non_select_all.result
      mysql-test/r/innodb_icp.result
      mysql-test/r/innodb_icp_all.result
      mysql-test/r/innodb_icp_none.result
      mysql-test/r/innodb_mrr_all.result
      mysql-test/r/innodb_mrr_cost_all.result
      mysql-test/r/join.result
      mysql-test/r/join_outer.result
      mysql-test/r/join_outer_bka.result
      mysql-test/r/join_outer_bka_nixbnl.result
      mysql-test/r/myisam_icp.result
      mysql-test/r/myisam_icp_all.result
      mysql-test/r/myisam_icp_none.result
      mysql-test/r/select_all_bka.result
      mysql-test/r/select_all_bka_nixbnl.result
      mysql-test/suite/opt_trace/include/general2.inc
      mysql-test/suite/opt_trace/r/general2_no_prot.result
      mysql-test/suite/opt_trace/r/general2_ps_prot.result
      mysql-test/suite/opt_trace/r/temp_table.result
      mysql-test/t/distinct.test
      mysql-test/t/group_by.test
      mysql-test/t/having.test
      mysql-test/t/join.test
      mysql-test/t/join_outer.test
      sql/field.cc
      sql/field.h
      sql/field_conv.cc
      sql/item_sum.cc
      sql/opt_sum.cc
      sql/rpl_slave.cc
      sql/sql_base.cc
      sql/sql_executor.cc
      sql/sql_lex.cc
      sql/sql_optimizer.cc
      sql/sql_parse.cc
      sql/sql_planner.cc
      sql/sql_select.cc
      sql/sql_tmp_table.cc
      sql/table.cc
      sql/table.h
      storage/myisam/mi_create.c
      unittest/gunit/bounded_queue-t.cc
      unittest/gunit/bounds_checked_array-t.cc
      unittest/gunit/cost_estimate-t.cc
      unittest/gunit/dbug-t.cc
      unittest/gunit/dynarray-t.cc
      unittest/gunit/field-t.cc
      unittest/gunit/filesort_buffer-t.cc
      unittest/gunit/get_diagnostics-t.cc
      unittest/gunit/gunit_test_main.cc
      unittest/gunit/item-t.cc
      unittest/gunit/mdl-t.cc
      unittest/gunit/mdl_mytap-t.cc
      unittest/gunit/my_regex-t.cc
      unittest/gunit/opt_range-t.cc
      unittest/gunit/opt_trace-t.cc
      unittest/gunit/sql_list-t.cc
      unittest/gunit/sql_plist-t.cc
      unittest/gunit/stdcxx-t.cc
      unittest/gunit/tap_event_listener.cc
      unittest/gunit/test_utils.cc
      unittest/gunit/thread_utils-t.cc
      unittest/gunit/thread_utils.cc
=== modified file 'storage/perfschema/unittest/pfs_benchmark_helper.cc'
--- a/storage/perfschema/unittest/pfs_benchmark_helper.cc	2011-10-27 23:08:08 +0000
+++ b/storage/perfschema/unittest/pfs_benchmark_helper.cc	2012-01-06 07:38:20 +0000
@@ -21,6 +21,21 @@ unsigned long long get_work_done()
 #include "my_global.h"
 #include "my_pthread.h"
 
+#if defined(__WIN__)
+/*
+  See include/my_pthread.h
+*/
+void EnterCriticalSection(LPCRITICAL_SECTION)
+{
+  return;
+}
+
+void LeaveCriticalSection(LPCRITICAL_SECTION)
+{
+  return;
+}
+#else
+
 int pthread_mutex_lock(pthread_mutex_t *)
 {
   return 0;
@@ -61,3 +76,5 @@ int pthread_cond_wait(mysql_cond_t *, my
   return 0;
 }
 
+#endif
+

No bundle (reason: useless for push emails).