diff options
| author | Marc Alff <marc.alff@oracle.com> | 2010-11-16 06:59:26 +0100 |
|---|---|---|
| committer | Marc Alff <marc.alff@oracle.com> | 2010-11-16 06:59:26 +0100 |
| commit | d6d16303cd5e2ba623f51a115f12954fe4a0ce2c (patch) | |
| tree | 106839bfb979ecf2e65809a2f75fe34ff4d717c9 /sql/mysqld.h | |
| parent | 6272025ad408a81f31d3adbb28c8a12bd00d2890 (diff) | |
| parent | 030c757f9fafaa66ab90b53e387816a11ccf37b5 (diff) | |
| download | mariadb-git-d6d16303cd5e2ba623f51a115f12954fe4a0ce2c.tar.gz | |
Local merge
Diffstat (limited to 'sql/mysqld.h')
| -rw-r--r-- | sql/mysqld.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/sql/mysqld.h b/sql/mysqld.h index dc9f94c0d03..113bc3aa983 100644 --- a/sql/mysqld.h +++ b/sql/mysqld.h @@ -270,9 +270,10 @@ extern PSI_file_key key_file_binlog, key_file_binlog_index, key_file_casetest, key_file_dbopt, key_file_des_key_file, key_file_ERRMSG, key_select_to_file, key_file_fileparser, key_file_frm, key_file_global_ddl_log, key_file_load, key_file_loadfile, key_file_log_event_data, key_file_log_event_info, - key_file_master_info, key_file_misc, key_file_MYSQL_LOG, key_file_partition, + key_file_master_info, key_file_misc, key_file_partition, key_file_pid, key_file_relay_log_info, key_file_send_file, key_file_tclog, key_file_trg, key_file_trn, key_file_init; +extern PSI_file_key key_file_query_log, key_file_slow_log; void init_server_psi_keys(); #endif /* HAVE_PSI_INTERFACE */ |