srv0srv.c:

  Add another diagnostic print to determine why the 'queries inside InnoDB' counter might drift upwards


innobase/srv/srv0srv.c:
  Add another diagnostic print to determine why the 'queries inside InnoDB' counter might drift upwards

innobase/srv/srv0srv.c

@@ -1715,6 +1715,7 @@ srv_conc_enter_innodb(
 	ibool			has_slept	= FALSE;
 	srv_conc_slot_t*	slot;
 	ulint			i;
+	char                    err_buf[1000];
 
 	if (srv_thread_concurrency >= 500) {
 		/* Disable the concurrency check */
@@ -1733,6 +1734,16 @@ srv_conc_enter_innodb(
 retry:
 	os_fast_mutex_lock(&srv_conc_mutex);
 
+	if (trx->declared_to_be_inside_innodb) {
+	        ut_print_timestamp(stderr);
+
+	        trx_print(err_buf, trx);
+
+	        fprintf(stderr,
+"  InnoDB: Error: trying to declare trx to enter InnoDB, but\n"
+"InnoDB: it already is declared.\n%s\n", err_buf);
+	}
+
 	if (srv_conc_n_threads < (lint)srv_thread_concurrency) {
 
 		srv_conc_n_threads++;