diff options
| author | Vladislav Vaintroub <vvaintroub@mysql.com> | 2009-06-10 10:59:49 +0200 |
|---|---|---|
| committer | Vladislav Vaintroub <vvaintroub@mysql.com> | 2009-06-10 10:59:49 +0200 |
| commit | 31b79618e34a36ff24d2e1a6186258dc18e12aa5 (patch) | |
| tree | 41fa2696a71a46f4885a21cf7c58dc438a600d7a /sql/sql_profile.h | |
| parent | 518e2498534cd996544238eb50d7e71da026ae19 (diff) | |
| download | mariadb-git-31b79618e34a36ff24d2e1a6186258dc18e12aa5.tar.gz | |
Backport WL#3653 to 5.1 to enable bundled innodb plugin.
Remove custom DLL loader code from innodb plugin code, use
symbols exported from mysqld.
Diffstat (limited to 'sql/sql_profile.h')
| -rw-r--r-- | sql/sql_profile.h | 23 |
1 files changed, 5 insertions, 18 deletions
diff --git a/sql/sql_profile.h b/sql/sql_profile.h index b5537487d26..245959e0953 100644 --- a/sql/sql_profile.h +++ b/sql/sql_profile.h @@ -16,25 +16,12 @@ #ifndef _SQL_PROFILE_H #define _SQL_PROFILE_H -#if __STDC_VERSION__ < 199901L -# if __GNUC__ >= 2 -# define __func__ __FUNCTION__ -# else -# define __func__ _unknown_func_ -extern const char * const _unknown_func_; -# endif -#elif defined(_MSC_VER) -# if _MSC_VER < 1300 -# define __func__ _unknown_func_ -extern const char * const _unknown_func_; -# else -# define __func__ __FUNCTION__ -# endif -#elif defined(__BORLANDC__) -# define __func__ __FUNC__ +#ifndef __func__ +#ifdef __FUNCTION__ +#define __func__ __FUNCTION__ #else -# define __func__ _unknown_func_ -extern const char * const _unknown_func_; +#define __func__ "unknown function" +#endif #endif extern ST_FIELD_INFO query_profile_statistics_info[]; |