From: Marc Alff Date: May 4 2011 5:55pm Subject: bzr commit into mysql-trunk-pfs-tuning branch (marc.alff:3371) List-Archive: http://lists.mysql.com/commits/136682 Message-Id: <201105041755.p44HteGj019090@acsmt356.oracle.com> MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="===============6225946673707539467==" --===============6225946673707539467== MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Content-Disposition: inline #At file:///Users/malff/BZR_TREE/mysql-trunk-pfs-tuning/ based on revid:marc.alff@stripped 3371 Marc Alff 2011-05-04 Code cleanup, fixed the build without P_S modified: include/my_global.h include/mysql/psi/mysql_thread.h include/mysql/psi/psi.h mysys/psi_noop.cc sql/CMakeLists.txt storage/perfschema/pfs_api.h === modified file 'include/my_global.h' --- a/include/my_global.h 2011-05-04 11:13:49 +0000 +++ b/include/my_global.h 2011-05-04 17:55:09 +0000 @@ -1489,13 +1489,12 @@ enum loglevel { }; #ifdef WITH_PERFSCHEMA_STORAGE_ENGINE -#define USE_PSI_V1 /* EXPERIMENTAL, DO NOT USE */ +/* #define USE_PSI_V1 */ /* #define PSI_CALL(API) pfs_ ## API ## _v1 */ +/* #include <../storage/perfschema/pfs_api.h> */ -#include -#include <../storage/perfschema/pfs_api.h> #endif /* WITH_PERFSCHEMA_STORAGE_ENGINE */ #endif /* my_global_h */ === modified file 'include/mysql/psi/mysql_thread.h' --- a/include/mysql/psi/mysql_thread.h 2011-05-04 11:13:49 +0000 +++ b/include/mysql/psi/mysql_thread.h 2011-05-04 17:55:09 +0000 @@ -606,7 +606,6 @@ static inline int inline_mysql_mutex_ini #ifdef HAVE_PSI_MUTEX_INTERFACE that->m_psi= PSI_CALL(init_mutex)(key, &that->m_mutex); #else -#warning "not using HAVE_PSI_MUTEX_INTERFACE" that->m_psi= NULL; #endif #ifdef SAFE_MUTEX === modified file 'include/mysql/psi/psi.h' --- a/include/mysql/psi/psi.h 2011-05-04 11:13:49 +0000 +++ b/include/mysql/psi/psi.h 2011-05-04 17:55:09 +0000 @@ -134,8 +134,6 @@ struct PSI_bootstrap #ifndef DISABLE_PSI_MUTEX #define HAVE_PSI_MUTEX_INTERFACE -#else -#warning "DISABLE_PSI_MUTEX" #endif /** === modified file 'mysys/psi_noop.cc' --- a/mysys/psi_noop.cc 2011-05-04 11:13:49 +0000 +++ b/mysys/psi_noop.cc 2011-05-04 17:55:09 +0000 @@ -13,13 +13,18 @@ along with this program; if not, write to the Free Software Foundation, 51 Franklin Street, Suite 500, Boston, MA 02110-1335 USA */ +/* + Always provide the noop performance interface, for plugins. +*/ + +#define USE_PSI_V1 +#define HAVE_PSI_INTERFACE + #include "my_global.h" #include "my_pthread.h" #include "my_sys.h" #include "mysql/psi/psi.h" -#ifdef HAVE_PSI_INTERFACE - static void register_mutex_noop(const char *category, PSI_mutex_info *info, int count) @@ -614,7 +619,6 @@ static PSI PSI_noop= set_statement_no_good_index_used_noop, end_statement_noop }; -#endif C_MODE_START @@ -633,6 +637,7 @@ struct PSI_bootstrap *PSI_hook= NULL; xyz_psi_server variable, obtained from PSI_bootstrap::get_interface() with the version used at compile time for plugin XYZ. */ + PSI *PSI_server= & PSI_noop; void set_psi_server(PSI *psi) === modified file 'sql/CMakeLists.txt' --- a/sql/CMakeLists.txt 2011-05-04 11:13:49 +0000 +++ b/sql/CMakeLists.txt 2011-05-04 17:55:09 +0000 @@ -310,7 +310,7 @@ ADD_CUSTOM_COMMAND( MYSQL_ADD_EXECUTABLE(mysql_tzinfo_to_sql tztime.cc) SET_TARGET_PROPERTIES(mysql_tzinfo_to_sql PROPERTIES COMPILE_FLAGS "-DTZINFO2SQL") -TARGET_LINK_LIBRARIES(mysql_tzinfo_to_sql mysys perfschema) +TARGET_LINK_LIBRARIES(mysql_tzinfo_to_sql mysys) ADD_CUSTOM_TARGET( GenServerSource === modified file 'storage/perfschema/pfs_api.h' --- a/storage/perfschema/pfs_api.h 2011-05-04 11:13:49 +0000 +++ b/storage/perfschema/pfs_api.h 2011-05-04 17:55:09 +0000 @@ -1,4 +1,10 @@ +#ifndef PFS_API_H +#define PFS_API_H + +#include +#include + C_MODE_START void pfs_register_mutex_v1(const char *category, struct PSI_mutex_info_v1 *info, int count); @@ -230,3 +236,6 @@ void pfs_set_statement_no_good_index_use void pfs_end_statement_v1(struct PSI_statement_locker *locker, void *stmt_da); C_MODE_END + +#endif + --===============6225946673707539467== 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-trunk-pfs-tuning/ # testament_sha1: 22726a060ff0f44951dd9a49ca569435a74b8c71 # timestamp: 2011-05-04 11:55:32 -0600 # base_revision_id: marc.alff@stripped\ # jxmu72eadf7dh7zx # # Begin bundle IyBCYXphYXIgcmV2aXNpb24gYnVuZGxlIHY0CiMKQlpoOTFBWSZTWS3o0c4ABJZfgAAQWHf/93vv XwC////wYAfuF8aoFKCG3VBRQDuwMNNQmU2mp5U9R5R+ijBA0AAZAaDQCSk9STajJ6Q/VPyk9TQ9 R6h6jyNTIAaABocwCYCZGAEYmJhMJghpiaYCRIEmqfhNU8FGI0DRoaABoA0GhzAJgJkYARiYmEwm CGmJpgJJBNNBMmEMgCTEymp6jTQybTUY0mnddjlGvM6ubaDOlpwBUlhRHr+uJwdk2GFjYvF5qnut F7m0dmuUcel1aoL4gbo1szgFmKWFXaVqztUnW1ew8ypjwF7RWSabbBsbTaPt0oL8KdT1MyZmyHRm c4VLXRKmvs6qyoaRMtE9TpKsrMk7p2rMqyPlxsz5IJZwI5T68XTP7bxR+oF+Y6pJBWjz27yOFWXa tuOoDbsVNgpL3hIvfUFcyBKCgCZEuIJB8rMXEoxOFlv8jZamRmZjgwiOP2QKE5I3HUA6mhw1O+zl EUkEh9t514wt0X9PSVWQhb1iIWVTVJw5DNUvNarUWV0xMzaNTU5XdTglMA3MIGYdo/t8SCjJTgBv cNCUiHDMSCXLzF4uM4SJzISE24mhLgVEjEqOcCBaFBS6oAokKZEvAcqFZ4yKGI7WuM9Veg+80rng zWyb0nBVHNhgemhCEnm828LSCEmQMqhUIJ2kqbqSFCtK6oZ4Ok/M/6QP71C2sgqT0pAXld8SwZLr e95QZl9VdBt2PNoBPXbcPn7afYVBCmZiKgvP5uLy0KDFYE084QCZiAfuL2KQDEzqfKxzWEBwprmc gEQ01jIjIrICxIi6HpHYSFkUwuLTYUEo741HxH1dIG3lOIiqaDU6mo82HDEpLZOKTIkgxlyJ7o/w bt84jLAc40lixXD07ZqraB2xWzYbKzHqL0GjMh4FtlJGskZabMS8zLwzxzG2lzDt2F6VzCI15JFZ JwBg4Y3zrIuCb1g7YUmRFBBKQwWMXpQXbDhrOspwuId7L0JbwBkGyCqgxI76DdebSZgcO0wCZjPu zsuBcPfRaYFh7m80LhxjWYF+0szoLHHiodlukVjXPg/7gCwg+Qqc34DNaTr41ESRA4OAoxHHMiQP Q5AHM6Udrr23YmbbciL+5I2GJwQejyEyQg1mbCtxwHb9wHE2FKCJ06RL8jogy1vdPdCGLbDk8kUg ESgG2lI6ltuJkcpvMDShqLksTB73aTYA0DwKEiQmMxLErimc9uONjdhBi7xqRkYkay47lYNKSqln J5S15OtRFpJRSQDs6JTQVs8edJrdkam220znFtgY2m2xbtvQiG+/vEL5/0/n8+OZhrQ2xNv8dPtL f93VO1d+kR1g7Al9LK2ChNaxVDDAPEg1FZ62A/ggmZLK2iZAp2Fa+2UlXA+gfgumPZmGGTJH5qEe kQWjMnOYrm5CwZpRJhjQWlxcVlpnLZjzYvBp0iFsEqT735Mg3H8Yn4L8xChqLTAops8B+WdlAhXp KWRaj1y95CBIRKB05jKCUcUrgmPA4YmTjwkrxcR87PeXyAXLZiw4QqrCkPxHFAQGMDIhyJkS8w7q lULs3CP5QJzIj/F55E3sIWUQ+h6DGwQt+BvtUw5ktxv4XciuZfRDdobQIEwOQ95JCpzJGpvHnBc5 OkT+wZYMgngdj1QS+CVbFnw+qAzVAc3cRWPfU90AA+uIeCiedJzJZkUsSk0NDTieQnixUuRY6T2e LEgwHMEdlBeiRIP3et7Ow36yeAwTPY1zPllk1H7uKjI8sjclYmA0AO9ztTsvDePU8ZHkVoKUJ9Hb DoHU7cnmhFdyRaYJDhC8gfsjVSMeTuRUTS4PGEK5LL9ReovcVIN60eB9zHtNDDxqDnIFQtWaoqxp E+AvmXOt6zJZSARLgscB0zLUGQBBQ4nqJOPQ0ccHxPPyE9HEt7IT6iXRyYZmeMpHQ19dELo6WIHt 0OfMQRO8VLqgiG32typ/956yyQSNBYIPp6nmfddSKF8NoqQDiUkoIOljPN9LG4XM1QR9jx7i9vQG Yaaa4JIMHA8PG30SvEJgTVH41CFSNp36rzLZhZZVegXIAawoPh0Qfsfqkwnd4KW0XsRyOXHvL5Uy SnuHn3iO13cupZ97efpRt2IHirxGghX5OChlK6A10/C5YUySbITk5gLHJwBCzubvJ/NfWjyMTA6u ELza1Bz8gXcAeHWIWQiAvhU2VjtNaZpcO4xMCSXIF72J2e1jCbwMzuGuMMNFKUkgk4+t0xuZRsys CZLQBe0M4JgQfF6QupwBySx+OSVKMJhdhTrHYYCppiy/qcmqgng21xQ42BxYKxViK0DhfPU41gfO s4rkzNTZeKJ+A1GxBarzR8jLnzWeB39yiAogt7ZP1Bc2LjJadquPXAqFK0Q4ODlF4FUPc4n9lIp8 C3cTegjLFGmq3X3yuw9qD7zUknEdiB4BZWNuLdk9KzQ2+fkeZynH3AOoHNrEGZoWrJCf8G1dCUDF BeEb9vETAuKE+BiLMAdOxp6UH/F3JFOFCQLejRzg --===============6225946673707539467==--