mirror of
https://github.com/MariaDB/server.git
synced 2025-01-28 01:34:17 +01:00
Backport of:
------------------------------------------------------------ revno: 2630.4.37 committer: Dmitry Lenev <dlenev@mysql.com> branch nick: mysql-6.0-3726-w2 timestamp: Wed 2008-06-25 20:28:57 +0400 message: Fix build failure of mysql-6.0-3726 tree on Windows. The failure was caused by the fact that sql/mdl.cc was using __func__ macro without including sql_profile.h header which contained definition of this macro for those platforms that miss it. This patch solves this problem by moving this define to include/my_global.h which makes it available in modules which don't/can't include sql/mysql_priv.h. This is a patch that is part of WL#3726. include/my_global.h: Moved definition of __func__ macro from sql/sql_profile.h to include/my_global.h to make it accessible from those modules of the server which don't include mysql_priv.h. sql/sql_profile.cc: Removed _unknown_func_ const variable since it is no longer used by __func__ macro. sql/sql_profile.h: Moved definition of __func__ macro from sql/sql_profile.h to include/my_global.h to make it accessible from those modules of the server which don't include mysql_priv.h.
This commit is contained in:
parent
9148af5cdb
commit
e91294243f
3 changed files with 19 additions and 11 deletions
|
@ -1574,6 +1574,25 @@ inline void operator delete[](void*, void*) { /* Do nothing */ }
|
|||
#define bool In_C_you_should_use_my_bool_instead()
|
||||
#endif
|
||||
|
||||
/* Provide __func__ macro definition for platforms that miss it. */
|
||||
#if __STDC_VERSION__ < 199901L
|
||||
# if __GNUC__ >= 2
|
||||
# define __func__ __FUNCTION__
|
||||
# else
|
||||
# define __func__ "<unknown>"
|
||||
# endif
|
||||
#elif defined(_MSC_VER)
|
||||
# if _MSC_VER < 1300
|
||||
# define __func__ "<unknown>"
|
||||
# else
|
||||
# define __func__ __FUNCTION__
|
||||
# endif
|
||||
#elif defined(__BORLANDC__)
|
||||
# define __func__ __FUNC__
|
||||
#else
|
||||
# define __func__ "<unknown>"
|
||||
#endif
|
||||
|
||||
#ifndef HAVE_RINT
|
||||
/**
|
||||
All integers up to this number can be represented exactly as double precision
|
||||
|
|
|
@ -38,9 +38,6 @@
|
|||
|
||||
#define MAX_QUERY_LENGTH 300
|
||||
|
||||
/* Reserved for systems that can't record the function name in source. */
|
||||
const char * const _unknown_func_ = "<unknown>";
|
||||
|
||||
/**
|
||||
Connects Information_Schema and Profiling.
|
||||
*/
|
||||
|
|
|
@ -16,14 +16,6 @@
|
|||
#ifndef _SQL_PROFILE_H
|
||||
#define _SQL_PROFILE_H
|
||||
|
||||
#ifndef __func__
|
||||
#ifdef __FUNCTION__
|
||||
#define __func__ __FUNCTION__
|
||||
#else
|
||||
#define __func__ "unknown function"
|
||||
#endif
|
||||
#endif
|
||||
|
||||
extern ST_FIELD_INFO query_profile_statistics_info[];
|
||||
int fill_query_profile_statistics_info(THD *thd, TABLE_LIST *tables, Item *cond);
|
||||
int make_profile_table_for_show(THD *thd, ST_SCHEMA_TABLE *schema_table);
|
||||
|
|
Loading…
Add table
Reference in a new issue