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

[Marc Alff]

 3376 Marc Alff	2011-05-20
      Disabled static PSI_CALL due to unresolved build issues

    modified:
      include/psi_provider.h
 3375 Marc Alff	2011-05-19 [merge]
      Merge mysql-trunk --> mysql-trunk-pfs-tuning

    added:
      include/mysql/thread_pool_priv.h
      mysql-test/include/not_threadpool.inc
      mysql-test/r/status_bug17954.result
      mysql-test/t/status_bug17954.test
      sql/mem_root_array.h
      unittest/gunit/dynarray-t.cc
    modified:
      BUILD/build_mccge.sh
      client/mysql.cc
      include/my_compiler.h
      include/my_sys.h
      include/mysql/plugin_audit.h.pp
      include/mysql/plugin_auth.h.pp
      include/mysql/plugin_ftparser.h.pp
      include/mysql/service_thd_wait.h
      libmysqld/lib_sql.cc
      mysql-test/include/have_archive_plugin.inc
      mysql-test/include/have_blackhole_plugin.inc
      mysql-test/include/mrr_tests.inc
      mysql-test/include/plugin.defs
      mysql-test/include/range.inc
      mysql-test/include/subquery.inc
      mysql-test/r/func_in_all.result
      mysql-test/r/func_time.result
      mysql-test/r/group_min_max.result
      mysql-test/r/innodb_mrr.result
      mysql-test/r/innodb_mrr_all.result
      mysql-test/r/innodb_mrr_cost.result
      mysql-test/r/innodb_mrr_cost_all.result
      mysql-test/r/innodb_mrr_cost_icp.result
      mysql-test/r/innodb_mrr_icp.result
      mysql-test/r/innodb_mrr_none.result
      mysql-test/r/myisam_mrr.result
      mysql-test/r/myisam_mrr_all.result
      mysql-test/r/myisam_mrr_cost.result
      mysql-test/r/myisam_mrr_cost_all.result
      mysql-test/r/myisam_mrr_cost_icp.result
      mysql-test/r/myisam_mrr_icp.result
      mysql-test/r/myisam_mrr_none.result
      mysql-test/r/range_icp.result
      mysql-test/r/range_icp_mrr.result
      mysql-test/r/range_mrr.result
      mysql-test/r/range_mrr_cost.result
      mysql-test/r/range_none.result
      mysql-test/r/status.result
      mysql-test/r/subquery_all.result
      mysql-test/r/subquery_all_jcl6.result
      mysql-test/r/subquery_nomat_nosj.result
      mysql-test/r/subquery_nomat_nosj_jcl6.result
      mysql-test/r/subquery_none.result
      mysql-test/r/subquery_none_jcl6.result
      mysql-test/suite/innodb/r/innodb-index.result
      mysql-test/suite/innodb/r/innodb.result
      mysql-test/suite/innodb/r/innodb_mysql.result
      mysql-test/suite/innodb/t/innodb-index.test
      mysql-test/suite/innodb/t/innodb.test
      mysql-test/suite/innodb/t/innodb_mysql.test
      mysql-test/suite/perfschema/t/no_threads.test
      mysql-test/suite/perfschema/t/one_thread_per_con.test
      mysql-test/suite/rpl/r/rpl_checksum.result
      mysql-test/suite/rpl/r/rpl_relayspace.result
      mysql-test/suite/rpl/t/rpl_checksum.test
      mysql-test/suite/rpl/t/rpl_relayspace.test
      mysql-test/suite/sys_vars/t/all_vars.test
      mysql-test/suite/sys_vars/t/slow_launch_time_func.test
      mysql-test/suite/sys_vars/t/thread_cache_size_func.test
      mysql-test/suite/sys_vars/t/wait_timeout_func.test
      mysql-test/t/func_time.test
      mysql-test/t/information_schema.test
      mysql-test/t/information_schema_db.test
      mysql-test/t/kill.test
      mysql-test/t/mysqlshow.test
      mysql-test/t/named_pipe.test
      mysql-test/t/no-threads.test
      mysql-test/t/shm.test
      mysql-test/t/status.test
      mysys/my_sync.c
      sql/debug_sync.cc
      sql/debug_sync.h
      sql/filesort.cc
      sql/filesort_utils.cc
      sql/ha_ndbcluster.cc
      sql/handler.cc
      sql/item_cmpfunc.cc
      sql/item_func.cc
      sql/item_func.h
      sql/item_timefunc.cc
      sql/log.cc
      sql/log.h
      sql/mdl.cc
      sql/mysqld.cc
      sql/mysqld.h
      sql/opt_range.cc
      sql/rpl_rli.cc
      sql/scheduler.cc
      sql/scheduler.h
      sql/sp_head.cc
      sql/sp_head.h
      sql/sql_class.cc
      sql/sql_class.h
      sql/sql_connect.cc
      sql/sql_connect.h
      sql/sql_const.h
      sql/sql_cursor.h
      sql/sql_prepare.cc
      sql/sql_select.cc
      sql/sql_select.h
      sql/sql_table.cc
      sql/sql_test.cc
      sql/sql_test.h
      sql/table.cc
      sql/uniques.cc
      storage/innobase/srv/srv0conc.c
      unittest/gunit/CMakeLists.txt
      unittest/gunit/mdl-t.cc
      unittest/gunit/mdl_mytap-t.cc
=== modified file 'include/psi_provider.h'
--- a/include/psi_provider.h	2011-05-05 01:15:08 +0000
+++ b/include/psi_provider.h	2011-05-20 06:59:52 +0000
@@ -18,6 +18,9 @@
 
 #include <my_global.h>
 
+/* TODO: resolve build issues with unit tests. */
+#undef WANT_STATIC_PSI_CALL
+
 #ifdef WANT_STATIC_PSI_CALL
 
 /* PSI provider: performance schema */

No bundle (reason: useless for push emails).