diff options
| author | Alexander Nozdrin <alik@sun.com> | 2009-12-04 15:39:09 +0300 |
|---|---|---|
| committer | Alexander Nozdrin <alik@sun.com> | 2009-12-04 15:39:09 +0300 |
| commit | 9651888e0e2b889f59d0e231903583a86edabc11 (patch) | |
| tree | 389961a1f7492f21bf1f330076d1d624e68c5a33 /include/my_sys.h | |
| parent | 87bd812fc809552014002eea706b6453af7c9d54 (diff) | |
| parent | 560e76c567c3551f5a4320acfc954200e8330ad8 (diff) | |
| download | mariadb-git-9651888e0e2b889f59d0e231903583a86edabc11.tar.gz | |
Auto-merge from mysql-next-mr.
Diffstat (limited to 'include/my_sys.h')
| -rw-r--r-- | include/my_sys.h | 12 |
1 files changed, 11 insertions, 1 deletions
diff --git a/include/my_sys.h b/include/my_sys.h index 3c8df28b151..87534a29703 100644 --- a/include/my_sys.h +++ b/include/my_sys.h @@ -1,4 +1,4 @@ -/* Copyright (C) 2000-2003 MySQL AB +/* Copyright (C) 2000-2003 MySQL AB, 2008-2009 Sun Microsystems, Inc This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -1018,5 +1018,15 @@ void netware_reg_user(const char *ip, const char *user, const char *application); #endif +#include <mysql/psi/psi.h> + +#ifdef HAVE_PSI_INTERFACE +extern MYSQL_PLUGIN_IMPORT struct PSI_bootstrap *PSI_hook; +void my_init_mysys_psi_keys(void); +#endif + +struct st_mysql_file; +extern struct st_mysql_file *mysql_stdin; + C_MODE_END #endif /* _my_sys_h */ |