diff --git a/include/my_global.h b/include/my_global.h
index 0f2aea62438..f95c8aa2441 100644
--- a/include/my_global.h
+++ b/include/my_global.h
@@ -1561,7 +1561,7 @@ inline void  operator delete[](void*, void*) { /* Do nothing */ }
 #if !defined(max)
 #define max(a, b)	((a) > (b) ? (a) : (b))
 #define min(a, b)	((a) < (b) ? (a) : (b))
-#endif  
+#endif
 /*
   Only Linux is known to need an explicit sync of the directory to make sure a
   file creation/deletion/renaming in(from,to) this directory durable.
diff --git a/include/my_sys.h b/include/my_sys.h
index 9121f0f249e..bbbc89cb9f8 100644
--- a/include/my_sys.h
+++ b/include/my_sys.h
@@ -235,6 +235,9 @@ extern void (*fatal_error_handler_hook)(uint my_err, const char *str,
 extern uint my_file_limit;
 extern ulong my_thread_stack_size;
 
+extern const char *(*proc_info_hook)(void *, const char *, const char *,
+                                     const char *, const unsigned int);
+
 #ifdef HAVE_LARGE_PAGES
 extern my_bool my_use_large_pages;
 extern uint    my_large_page_size;
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
diff --git a/sql/mysqld.cc b/sql/mysqld.cc
index ee341314cd6..1055d5fed8b 100644
--- a/sql/mysqld.cc
+++ b/sql/mysqld.cc
@@ -3828,6 +3828,10 @@ static int init_server_components()
     }
   }
 
+  proc_info_hook= (const char *(*)(void *, const char *, const char *,
+                                   const char *, const unsigned int))
+                  set_thd_proc_info;
+
   if (xid_cache_init())
   {
     sql_print_error("Out of memory");
diff --git a/sql/sql_class.cc b/sql/sql_class.cc
index de2ef98e993..ee6612acfe2 100644
--- a/sql/sql_class.cc
+++ b/sql/sql_class.cc
@@ -247,13 +247,16 @@ int thd_tablespace_op(const THD *thd)
 
 
 extern "C"
-const char *set_thd_proc_info(THD *thd, const char *info, 
-                              const char *calling_function, 
-                              const char *calling_file, 
+const char *set_thd_proc_info(THD *thd, const char *info,
+                              const char *calling_function,
+                              const char *calling_file,
                               const unsigned int calling_line)
 {
+  if (!thd)
+    thd= current_thd;
+
   const char *old_info= thd->proc_info;
-  DBUG_PRINT("proc_info", ("%s:%d  %s", calling_file, calling_line, 
+  DBUG_PRINT("proc_info", ("%s:%d  %s", calling_file, calling_line,
                            (info != NULL) ? info : "(null)"));
 #if defined(ENABLED_PROFILING)
   thd->profiling.status_change(info, calling_function, calling_file, calling_line);