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/sql_repl.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/sql_repl.h')
| -rw-r--r-- | sql/sql_repl.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/sql/sql_repl.h b/sql/sql_repl.h index da55e3e863f..018b23673ee 100644 --- a/sql/sql_repl.h +++ b/sql/sql_repl.h @@ -67,7 +67,9 @@ int log_loaded_block(IO_CACHE* file); int init_replication_sys_vars(); void mysql_binlog_send(THD* thd, char* log_ident, my_off_t pos, ushort flags); +#ifdef HAVE_PSI_INTERFACE extern PSI_mutex_key key_LOCK_slave_state, key_LOCK_binlog_state; +#endif void rpl_init_gtid_slave_state(); void rpl_deinit_gtid_slave_state(); int gtid_state_from_binlog_pos(const char *name, uint32 pos, String *out_str); |