MDEV-7088: Query stats for compression based on TRIM size

Analysis: Status variables were missing from innodb_status_variables
array.

Fix: Add missing status variables to the array.

mysql-test/suite/sys_vars/r/innodb_monitor_disable_basic.result

@@ -47,6 +47,7 @@ buffer_data_written	disabled
 buffer_flush_batch_scanned	disabled
 buffer_flush_batch_num_scan	disabled
 buffer_flush_batch_scanned_per_call	disabled
+buffer_flush_batch_rescan	disabled
 buffer_flush_batch_total_pages	disabled
 buffer_flush_batches	disabled
 buffer_flush_batch_pages	disabled

mysql-test/suite/sys_vars/r/innodb_monitor_enable_basic.result

@@ -47,6 +47,7 @@ buffer_data_written	disabled
 buffer_flush_batch_scanned	disabled
 buffer_flush_batch_num_scan	disabled
 buffer_flush_batch_scanned_per_call	disabled
+buffer_flush_batch_rescan	disabled
 buffer_flush_batch_total_pages	disabled
 buffer_flush_batches	disabled
 buffer_flush_batch_pages	disabled

mysql-test/suite/sys_vars/r/innodb_monitor_reset_all_basic.result

@@ -47,6 +47,7 @@ buffer_data_written	disabled
 buffer_flush_batch_scanned	disabled
 buffer_flush_batch_num_scan	disabled
 buffer_flush_batch_scanned_per_call	disabled
+buffer_flush_batch_rescan	disabled
 buffer_flush_batch_total_pages	disabled
 buffer_flush_batches	disabled
 buffer_flush_batch_pages	disabled

mysql-test/suite/sys_vars/r/innodb_monitor_reset_basic.result

@@ -47,6 +47,7 @@ buffer_data_written	disabled
 buffer_flush_batch_scanned	disabled
 buffer_flush_batch_num_scan	disabled
 buffer_flush_batch_scanned_per_call	disabled
+buffer_flush_batch_rescan	disabled
 buffer_flush_batch_total_pages	disabled
 buffer_flush_batches	disabled
 buffer_flush_batch_pages	disabled

storage/innobase/handler/ha_innodb.cc

@@ -760,8 +760,18 @@ static SHOW_VAR innodb_status_variables[]= {
    (char*) &export_vars.innodb_page_compression_saved,    SHOW_LONGLONG},
   {"page_compression_trim_sect512",
    (char*) &export_vars.innodb_page_compression_trim_sect512,    SHOW_LONGLONG},
+  {"page_compression_trim_sect1024",
+   (char*) &export_vars.innodb_page_compression_trim_sect1024,    SHOW_LONGLONG},
+  {"page_compression_trim_sect2048",
+   (char*) &export_vars.innodb_page_compression_trim_sect2048,    SHOW_LONGLONG},
   {"page_compression_trim_sect4096",
    (char*) &export_vars.innodb_page_compression_trim_sect4096,    SHOW_LONGLONG},
+  {"page_compression_trim_sect8192",
+   (char*) &export_vars.innodb_page_compression_trim_sect8192,    SHOW_LONGLONG},
+  {"page_compression_trim_sect16384",
+   (char*) &export_vars.innodb_page_compression_trim_sect16384,    SHOW_LONGLONG},
+  {"page_compression_trim_sect32768",
+   (char*) &export_vars.innodb_page_compression_trim_sect32768,    SHOW_LONGLONG},
   {"num_index_pages_written",
    (char*) &export_vars.innodb_index_pages_written,       SHOW_LONGLONG},
   {"num_non_index_pages_written",

storage/innobase/include/srv0mon.h

@@ -174,6 +174,7 @@ enum monitor_id_t {
 	MONITOR_FLUSH_BATCH_SCANNED,
 	MONITOR_FLUSH_BATCH_SCANNED_NUM_CALL,
 	MONITOR_FLUSH_BATCH_SCANNED_PER_CALL,
+	MONITOR_FLUSH_HP_RESCAN,
 	MONITOR_FLUSH_BATCH_TOTAL_PAGE,
 	MONITOR_FLUSH_BATCH_COUNT,
 	MONITOR_FLUSH_BATCH_PAGES,

storage/innobase/srv/srv0mon.cc

@@ -350,6 +350,11 @@ static monitor_info_t	innodb_counter_info[] =
 	 MONITOR_SET_MEMBER, MONITOR_FLUSH_BATCH_SCANNED,
 	 MONITOR_FLUSH_BATCH_SCANNED_PER_CALL},
 
+	{"buffer_flush_batch_rescan", "buffer",
+	 "Number of times rescan of flush list forced",
+	 MONITOR_NONE,
+	 MONITOR_DEFAULT_START, MONITOR_FLUSH_HP_RESCAN},
+
 	/* Cumulative counter for pages flushed in flush batches */
 	{"buffer_flush_batch_total_pages", "buffer",
 	 "Total pages flushed as part of flush batch",

storage/xtradb/handler/ha_innodb.cc

@@ -959,8 +959,18 @@ static SHOW_VAR innodb_status_variables[]= {
    (char*) &export_vars.innodb_page_compression_saved,    SHOW_LONGLONG},
   {"page_compression_trim_sect512",
    (char*) &export_vars.innodb_page_compression_trim_sect512,    SHOW_LONGLONG},
+  {"page_compression_trim_sect1024",
+   (char*) &export_vars.innodb_page_compression_trim_sect1024,    SHOW_LONGLONG},
+  {"page_compression_trim_sect2048",
+   (char*) &export_vars.innodb_page_compression_trim_sect2048,    SHOW_LONGLONG},
   {"page_compression_trim_sect4096",
    (char*) &export_vars.innodb_page_compression_trim_sect4096,    SHOW_LONGLONG},
+  {"page_compression_trim_sect8192",
+   (char*) &export_vars.innodb_page_compression_trim_sect8192,    SHOW_LONGLONG},
+  {"page_compression_trim_sect16384",
+   (char*) &export_vars.innodb_page_compression_trim_sect16384,    SHOW_LONGLONG},
+  {"page_compression_trim_sect32768",
+   (char*) &export_vars.innodb_page_compression_trim_sect32768,    SHOW_LONGLONG},
   {"num_index_pages_written",
    (char*) &export_vars.innodb_index_pages_written,       SHOW_LONGLONG},
   {"num_non_index_pages_written",

storage/xtradb/srv/srv0mon.cc

@@ -350,6 +350,11 @@ static monitor_info_t	innodb_counter_info[] =
 	 MONITOR_SET_MEMBER, MONITOR_FLUSH_BATCH_SCANNED,
 	 MONITOR_FLUSH_BATCH_SCANNED_PER_CALL},
 
+	{"buffer_flush_batch_rescan", "buffer",
+	 "Number of times rescan of flush list forced",
+	 MONITOR_NONE,
+	 MONITOR_DEFAULT_START, MONITOR_FLUSH_HP_RESCAN},
+
 	/* Cumulative counter for pages flushed in flush batches */
 	{"buffer_flush_batch_total_pages", "buffer",
 	 "Total pages flushed as part of flush batch",
@@ -1920,10 +1925,10 @@ srv_mon_process_existing_counter(
         case MONITOR_OVLD_PAGE_COMPRESS_TRIM_SECT512:
 		value = srv_stats.page_compression_trim_sect512;
 		break;
-       case MONITOR_OVLD_PAGE_COMPRESS_TRIM_SECT1024:
+	case MONITOR_OVLD_PAGE_COMPRESS_TRIM_SECT1024:
 		value = srv_stats.page_compression_trim_sect1024;
 		break;
-       case MONITOR_OVLD_PAGE_COMPRESS_TRIM_SECT2048:
+	case MONITOR_OVLD_PAGE_COMPRESS_TRIM_SECT2048:
 		value = srv_stats.page_compression_trim_sect2048;
 		break;
         case MONITOR_OVLD_PAGE_COMPRESS_TRIM_SECT4096: