summaryrefslogtreecommitdiff
path: root/mysys/my_static.c
diff options
context:
space:
mode:
authorAlexander Nozdrin <alik@sun.com>2009-10-14 12:25:39 +0400
committerAlexander Nozdrin <alik@sun.com>2009-10-14 12:25:39 +0400
commitc30d924dd5485f24818264d8e533820bcf1bcba0 (patch)
tree1b3260f72106f50b182546dff41127a389144fa1 /mysys/my_static.c
parent829525756e7a769b0c0de716f6207f5f21daa994 (diff)
parent310833ff2e6a3c1e3ef397e78605661eee430198 (diff)
downloadmariadb-git-c30d924dd5485f24818264d8e533820bcf1bcba0.tar.gz
Manual merge from mysql-trunk-merge.
Diffstat (limited to 'mysys/my_static.c')
-rw-r--r--mysys/my_static.c8
1 files changed, 8 insertions, 0 deletions
diff --git a/mysys/my_static.c b/mysys/my_static.c
index 14f04491430..62e6d402315 100644
--- a/mysys/my_static.c
+++ b/mysys/my_static.c
@@ -92,6 +92,14 @@ 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;
+#if defined(ENABLED_DEBUG_SYNC)
+/**
+ Global pointer to be set if callback function is defined
+ (e.g. in mysqld). See sql/debug_sync.cc.
+*/
+void (*debug_sync_C_callback_ptr)(const char *, size_t);
+#endif /* defined(ENABLED_DEBUG_SYNC) */
+
#ifdef __WIN__
/* from my_getsystime.c */
ulonglong query_performance_frequency, query_performance_offset;