Remove some debug-only global status variables

storage/innobase/btr/btr0sea.cc

@@ -1310,8 +1310,6 @@ void btr_search_drop_page_hash_when_freed(const page_id_t& page_id)
 	mtr_t		mtr;
 	dberr_t		err = DB_SUCCESS;
 
-	ut_d(export_vars.innodb_ahi_drop_lookups++);
-
 	mtr_start(&mtr);
 
 	/* If the caller has a latch on the page, then the caller must

storage/innobase/handler/ha_innodb.cc

@@ -1100,14 +1100,6 @@ static SHOW_VAR innodb_status_variables[]= {
   (char*) &export_vars.innodb_truncated_status_writes,	  SHOW_LONG},
   {"available_undo_logs",
   (char*) &export_vars.innodb_available_undo_logs,        SHOW_LONG},
-#ifdef UNIV_DEBUG
-  {"purge_trx_id_age",
-  (char*) &export_vars.innodb_purge_trx_id_age,           SHOW_LONG},
-  {"purge_view_trx_id_age",
-  (char*) &export_vars.innodb_purge_view_trx_id_age,      SHOW_LONG},
-  {"ahi_drop_lookups",
-  (char*) &export_vars.innodb_ahi_drop_lookups,           SHOW_LONG},
-#endif /* UNIV_DEBUG */
 
   /* Status variables for page compression */
   {"page_compression_saved",

storage/innobase/include/srv0srv.h

@@ -1036,15 +1036,6 @@ struct export_var_t{
 						of used row log buffer */
 	ulint innodb_onlineddl_pct_progress;	/*!< Online alter progress */
 
-#ifdef UNIV_DEBUG
-	ulint innodb_purge_trx_id_age;		/*!< rw_max_trx_id - purged trx_id */
-	ulint innodb_purge_view_trx_id_age;	/*!< rw_max_trx_id
-						- purged view's min trx_id */
-	ulint innodb_ahi_drop_lookups;		/*!< number of adaptive hash
-						index lookups when freeing
-						file pages */
-#endif /* UNIV_DEBUG */
-
 	int64_t innodb_page_compression_saved;/*!< Number of bytes saved
 						by page compression */
 	int64_t innodb_index_pages_written;  /*!< Number of index pages

storage/innobase/srv/srv0srv.cc

@@ -1655,32 +1655,6 @@ srv_export_innodb_status(void)
 	export_vars.innodb_onlineddl_rowlog_pct_used = onlineddl_rowlog_pct_used;
 	export_vars.innodb_onlineddl_pct_progress = onlineddl_pct_progress;
 
-#ifdef UNIV_DEBUG
-	rw_lock_s_lock(&purge_sys->latch);
-	trx_id_t	up_limit_id	= purge_sys->view.up_limit_id();;
-	trx_id_t	done_trx_no	= purge_sys->done.trx_no;
-	rw_lock_s_unlock(&purge_sys->latch);
-
-	mutex_enter(&trx_sys->mutex);
-	trx_id_t	max_trx_id	= trx_sys->rw_max_trx_id;
-	mutex_exit(&trx_sys->mutex);
-
-	if (!done_trx_no || max_trx_id < done_trx_no - 1) {
-		export_vars.innodb_purge_trx_id_age = 0;
-	} else {
-		export_vars.innodb_purge_trx_id_age =
-			(ulint) (max_trx_id - done_trx_no + 1);
-	}
-
-	if (!up_limit_id
-	    || max_trx_id < up_limit_id) {
-		export_vars.innodb_purge_view_trx_id_age = 0;
-	} else {
-		export_vars.innodb_purge_view_trx_id_age =
-			(ulint) (max_trx_id - up_limit_id);
-	}
-#endif /* UNIV_DEBUG */
-
 	export_vars.innodb_sec_rec_cluster_reads =
 		srv_stats.n_sec_rec_cluster_reads;
 	export_vars.innodb_sec_rec_cluster_reads_avoided =