branches/zip: innobase_mysql_end_print_arbitrary_thd(): Note that

kernel_mutex must be released before calling this function.

innobase_mysql_end_print_arbitrary_thd(),
innobase_mysql_prepare_print_arbitrary_thd(): Assert that the
kernel_mutex is not being held by the current thread.

handler/ha_innodb.cc

@@ -709,17 +709,21 @@ void
 innobase_mysql_prepare_print_arbitrary_thd(void)
 /*============================================*/
 {
+	ut_ad(!mutex_own(&kernel_mutex));
 	VOID(pthread_mutex_lock(&LOCK_thread_count));
 }
 
 /*****************************************************************
 Releases the mutex reserved by innobase_mysql_prepare_print_arbitrary_thd().
-*/
+In the InnoDB latching order, the mutex sits right above the
+kernel_mutex.  In debug builds, we assert that the kernel_mutex is
+released before this function is invoked. */
 extern "C"
 void
 innobase_mysql_end_print_arbitrary_thd(void)
 /*========================================*/
 {
+	ut_ad(!mutex_own(&kernel_mutex));
 	VOID(pthread_mutex_unlock(&LOCK_thread_count));
 }
 

include/ha_prototypes.h

@@ -109,7 +109,9 @@ innobase_mysql_prepare_print_arbitrary_thd(void);
 
 /*****************************************************************
 Releases the mutex reserved by innobase_mysql_prepare_print_arbitrary_thd().
-*/
+In the InnoDB latching order, the mutex sits right above the
+kernel_mutex.  In debug builds, we assert that the kernel_mutex is
+released before this function is invoked. */
 
 void
 innobase_mysql_end_print_arbitrary_thd(void);