diff options
| author | Konstantin Osipov <kostja@sun.com> | 2009-12-03 21:59:52 +0300 |
|---|---|---|
| committer | Konstantin Osipov <kostja@sun.com> | 2009-12-03 21:59:52 +0300 |
| commit | f9f2bd193f934c8e2904688335f5103472391b1b (patch) | |
| tree | c209a443889edefd4af0c0272b119d68097e7dcf /mysys/my_static.c | |
| parent | c52d4830bf167cfe0b536be28a0adca121ae5d72 (diff) | |
| download | mariadb-git-f9f2bd193f934c8e2904688335f5103472391b1b.tar.gz | |
Backport of:
-----------------------------------------------------------
2497.479.10 Sergei Golubchik 2008-08-27
proc_info_hook, mysys access to thd->proc_info
This patch is necessary for backport of WL#4284 "Transactional
DDL locking".
include/my_global.h:
proc_info_hook
include/my_sys.h:
proc_info_hook
mysys/my_static.c:
proc_info_hook
sql/mysqld.cc:
proc_info_hook
sql/sql_class.cc:
proc_info_hook
Diffstat (limited to 'mysys/my_static.c')
| -rw-r--r-- | mysys/my_static.c | 13 |
1 files changed, 13 insertions, 0 deletions
diff --git a/mysys/my_static.c b/mysys/my_static.c index 62e6d402315..62caeee89c4 100644 --- a/mysys/my_static.c +++ b/mysys/my_static.c @@ -92,6 +92,19 @@ void (*error_handler_hook)(uint error,const char *str,myf MyFlags)= void (*fatal_error_handler_hook)(uint error,const char *str,myf MyFlags)= my_message_no_curses; +static const char *proc_info_dummy(void *a __attribute__((unused)), + const char *b __attribute__((unused)), + const char *c __attribute__((unused)), + const char *d __attribute__((unused)), + const unsigned int e __attribute__((unused))) +{ + return 0; +} + +/* this is to be able to call set_thd_proc_info from the C code */ +const char *(*proc_info_hook)(void *, const char *, const char *, const char *, + const unsigned int)= proc_info_dummy; + #if defined(ENABLED_DEBUG_SYNC) /** Global pointer to be set if callback function is defined |