diff --git a/storage/innobase/dict/dict0stats.cc b/storage/innobase/dict/dict0stats.cc
index e3a9a6a..fa72861 100644
--- a/storage/innobase/dict/dict0stats.cc
+++ b/storage/innobase/dict/dict0stats.cc
@@ -1891,6 +1891,18 @@ dict_stats_analyze_index(
 	DEBUG_PRINTF("  %s(index=%s)\n", __func__, index->name());
 
 	dict_stats_empty_index(index);
+        if (strcmp(index->name, "PRIMARY"))
+        {
+          struct stat dummy;
+          if (!stat("/tmp/dict_stats_analyze_index_must_stop", &dummy))
+          {
+            fprintf(stderr, "AAA: dict_stats_analyze_index called dict_stats_empty_index for %s\n", index->name());
+            while (!stat("/tmp/dict_stats_analyze_index_must_stop", &dummy))
+              my_sleep(1000);
+          }
+          //DEBUG_SYNC_C("analyze_dict_stats_empty_index");  // doesn't work in background threads
+          fprintf(stderr, "AAA: dict_stats_analyze_index: continuing for %s\n", index->name());
+        }
 
 	mtr_start(&mtr);
 
diff --git a/storage/innobase/handler/ha_innodb.cc b/storage/innobase/handler/ha_innodb.cc
index 1a65c5f..9331031 100644
--- a/storage/innobase/handler/ha_innodb.cc
+++ b/storage/innobase/handler/ha_innodb.cc
@@ -14030,6 +14030,7 @@ ha_innobase::info_low(
 
 		ut_a(ib_table->stat_initialized);
 
+                fprintf(stderr, "AAA: ha_innobase::info_low recalculates rec_per_key\n");
 		for (i = 0; i < table->s->keys; i++) {
 			ulong	j;
 			/* We could get index quickly through internal