diff options
| author | Sergey Vojtovich <svoj@mariadb.org> | 2013-11-14 18:00:00 +0400 |
|---|---|---|
| committer | Sergey Vojtovich <svoj@mariadb.org> | 2013-11-14 18:00:00 +0400 |
| commit | 1da6d6880bfac43364f0aceb28b9dc062c31f76c (patch) | |
| tree | b266115b3bc579fa071a20ce1e2d92e3ed14ee2f /sql/my_apc.h | |
| parent | 26f56089c734852dc31d98fd73e1d8f1750bd1a8 (diff) | |
| download | mariadb-git-1da6d6880bfac43364f0aceb28b9dc062c31f76c.tar.gz | |
MDEV-5220 - [PATCH] MariaDB 10.0.4 doesn't compile without perfschema
Fixed the following compilation errors and test failures:
- maria SE: "stage_waiting_for_a_resource" wasn't declared w/o PFS
- sql_repl.h: PSI_mutex_key is not available in non-PFS builds
- mysqld.cc: pfs_param is not available in non-PFS builds
- mysqld.cc: init_show_explain_psi_keys() is not available in non-PFS builds
- mysqld.cc: call net_before_header_psi, net_after_header_psi even if PFS
is not available so that thread enters stage_init at proper time. Fixes
sp-threads and a few tests in funcs_1.
- myisam_file_io.opt: added missing loose prefix
Diffstat (limited to 'sql/my_apc.h')
| -rw-r--r-- | sql/my_apc.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/sql/my_apc.h b/sql/my_apc.h index a12db5093a4..4643e641ff1 100644 --- a/sql/my_apc.h +++ b/sql/my_apc.h @@ -134,6 +134,8 @@ private: #ifdef HAVE_PSI_INTERFACE void init_show_explain_psi_keys(void); +#else +#define init_show_explain_psi_keys() /* no-op */ #endif #endif //SQL_MY_APC_INCLUDED |