summaryrefslogtreecommitdiff
path: root/sql/sql_profile.h
diff options
context:
space:
mode:
authorSergei Golubchik <serg@mysql.com>2008-08-27 14:15:06 +0200
committerSergei Golubchik <serg@mysql.com>2008-08-27 14:15:06 +0200
commitca23272e1e53e195169bec0609eb0168722e1879 (patch)
tree86b3438ca88d45f7642023edf639b82231659ba9 /sql/sql_profile.h
parente2219ec965a80b2034d9debcbf12d3e73a684d89 (diff)
downloadmariadb-git-ca23272e1e53e195169bec0609eb0168722e1879.tar.gz
proc_info_hook, mysys access to thd->proc_info
include/my_global.h: move __func__ definition to my_global.h include/my_sys.h: proc_info_hook mysys/my_static.c: proc_info_hook sql/mysqld.cc: proc_info_hook sql/sql_class.cc: support thd==0 in set_thd_proc_info sql/sql_profile.cc: move __func__ definition to my_global.h sql/sql_profile.h: move __func__ definition to my_global.h
Diffstat (limited to 'sql/sql_profile.h')
-rw-r--r--sql/sql_profile.h21
1 files changed, 0 insertions, 21 deletions
diff --git a/sql/sql_profile.h b/sql/sql_profile.h
index b5537487d26..3ddec4e3811 100644
--- a/sql/sql_profile.h
+++ b/sql/sql_profile.h
@@ -16,27 +16,6 @@
#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__
-#else
-# define __func__ _unknown_func_
-extern const char * const _unknown_func_;
-#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);