branches/zip: Declare innobase_mysql_print_thd() in ha_prototypes.h.

handler/ha_innodb.cc

@@ -744,23 +744,19 @@ innobase_mysql_end_print_arbitrary_thd(void)
 }
 
 /*****************************************************************
-Prints info of a THD object (== user session thread) to the given file.
-NOTE that /mysql/innobase/trx/trx0trx.c must contain the prototype for
-this function! */
+Prints info of a THD object (== user session thread) to the given file. */
 extern "C"
 void
 innobase_mysql_print_thd(
 /*=====================*/
 	FILE*	f,		/* in: output stream */
-	void*	input_thd,	/* in: pointer to a MySQL THD object */
+	void*	thd,		/* in: pointer to a MySQL THD object */
 	uint	max_query_len)	/* in: max query length to print, or 0 to
 				   use the default max length */
 {
-	THD*	thd;
 	char	buffer[1024];
 
-	thd = (THD*) input_thd;
-	fputs(thd_security_context(thd, buffer, sizeof(buffer), 
+	fputs(thd_security_context((THD*) thd, buffer, sizeof buffer,
 				   max_query_len), f);
 	putc('\n', f);
 }

include/ha_prototypes.h

@@ -48,4 +48,14 @@ thd_has_edited_nontrans_tables(
 			been edited */
 	void*	thd);	/* in: thread handle (THD*) */
 
+/*****************************************************************
+Prints info of a THD object (== user session thread) to the given file. */
+
+void
+innobase_mysql_print_thd(
+/*=====================*/
+	FILE*	f,		/* in: output stream */
+	void*	thd,		/* in: pointer to a MySQL THD object */
+	uint	max_query_len);	/* in: max query length to print, or 0 to
+				   use the default max length */
 #endif

trx/trx0trx.c

@@ -27,14 +27,6 @@ Created 3/26/1996 Heikki Tuuri
 #include "trx0xa.h"
 #include "ha_prototypes.h"
 
-/* Copy of the prototype for innobase_mysql_print_thd: this
-copy MUST be equal to the one in mysql/sql/ha_innodb.cc ! */
-
-void innobase_mysql_print_thd(
-	FILE*	f,
-	void*	thd,
-	ulint	max_query_len);
-
 /* Dummy session used currently in MySQL interface */
 sess_t*		trx_dummy_sess = NULL;