summaryrefslogtreecommitdiff
path: root/mysys/my_static.c
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 /mysys/my_static.c
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 'mysys/my_static.c')
-rw-r--r--mysys/my_static.c9
1 files changed, 9 insertions, 0 deletions
diff --git a/mysys/my_static.c b/mysys/my_static.c
index ef25a89bad9..4dc965e8a20 100644
--- a/mysys/my_static.c
+++ b/mysys/my_static.c
@@ -92,6 +92,15 @@ int (*error_handler_hook)(uint error,const char *str,myf MyFlags)=
int (*fatal_error_handler_hook)(uint error,const char *str,myf MyFlags)=
my_message_no_curses;
+static const char *proc_info_dummy(void *a, const char *b, const char *c,
+ const char *d, const unsigned int e)
+{
+ return 0;
+}
+
+const char *(*proc_info_hook)(void *, const char *, const char *, const char *,
+ const unsigned int)= proc_info_dummy;
+
#ifdef __WIN__
/* from my_getsystime.c */
ulonglong query_performance_frequency, query_performance_offset;