diff options
| author | Sergei Golubchik <sergii@pisem.net> | 2013-07-17 21:24:29 +0200 |
|---|---|---|
| committer | Sergei Golubchik <sergii@pisem.net> | 2013-07-17 21:24:29 +0200 |
| commit | 97e640b9ae83e07b444fceede6b0524256c7a3cc (patch) | |
| tree | 8f48fbfaf88ea7895ce59fd3ac2fbe6184334387 /plugin/sql_errlog | |
| parent | 2f6a2494a5eb2cf3ab06fbedd2584eca85d90230 (diff) | |
| parent | c7973615e723b13c6457b494b72be2fac35bfd18 (diff) | |
| download | mariadb-git-97e640b9ae83e07b444fceede6b0524256c7a3cc.tar.gz | |
5.5 merge
Diffstat (limited to 'plugin/sql_errlog')
| -rw-r--r-- | plugin/sql_errlog/sql_logger.cc | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/plugin/sql_errlog/sql_logger.cc b/plugin/sql_errlog/sql_logger.cc index 8bf757f2fd7..dd6363d1448 100644 --- a/plugin/sql_errlog/sql_logger.cc +++ b/plugin/sql_errlog/sql_logger.cc @@ -21,10 +21,12 @@ extern MYSQL_PLUGIN_IMPORT char *mysql_data_home; +#ifdef HAVE_PSI_INTERFACE /* These belong to the service initialization */ static PSI_mutex_key key_LOCK_logger_service; static PSI_mutex_info mutex_list[]= {{ &key_LOCK_logger_service, "logger_service_file_st::lock", PSI_FLAG_GLOBAL}}; +#endif typedef struct logger_handle_st { File file; @@ -188,7 +190,9 @@ int logger_printf(LOGGER_HANDLE *log, const char *fmt, ...) void init_logger_mutexes() { +#ifdef HAVE_PSI_INTERFACE if (PSI_server) PSI_server->register_mutex("sql_logger", mutex_list, 1); +#endif } |