Made mrr related counters temporarily invisible until we agree upon their names.

mysql-test/r/myisam_mrr.result

@@ -563,9 +563,6 @@ drop table t1;
 flush status;
 show status like 'Handler_mrr%';
 Variable_name	Value
-Handler_mrr_extra_key_sorts	0
-Handler_mrr_extra_rowid_sorts	0
-Handler_mrr_init	0
 create table t0 (a int);
 insert into t0 values (0),(1),(2),(3),(4),(5),(6),(7),(8),(9);
 create table t1 (a int, b int, filler char(200), key(a));
@@ -581,9 +578,6 @@ sum(b)
 1230
 show status like 'handler_mrr%';
 Variable_name	Value
-Handler_mrr_extra_key_sorts	0
-Handler_mrr_extra_rowid_sorts	0
-Handler_mrr_init	1
 set @mrr_buffer_size_save= @@mrr_buffer_size;
 set mrr_buffer_size=128;
 explain select sum(b) from t1 where a < 1600;
@@ -596,9 +590,6 @@ sum(b)
 196800
 show status like 'handler_mrr%';
 Variable_name	Value
-Handler_mrr_extra_key_sorts	0
-Handler_mrr_extra_rowid_sorts	1
-Handler_mrr_init	1
 set @@mrr_buffer_size= @mrr_buffer_size_save;
 #Now, let's check BKA: 
 set @join_cache_level_save= @@join_cache_level;
@@ -614,9 +605,6 @@ sum(t1.b)
 1230
 show status like 'handler_mrr%';
 Variable_name	Value
-Handler_mrr_extra_key_sorts	0
-Handler_mrr_extra_rowid_sorts	0
-Handler_mrr_init	1
 set join_buffer_size=10;
 explain select sum(t1.b) from t0,t1 where t0.a=t1.a;
 id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra
@@ -628,9 +616,6 @@ sum(t1.b)
 1230
 show status like 'handler_mrr%';
 Variable_name	Value
-Handler_mrr_extra_key_sorts	1or2
-Handler_mrr_extra_rowid_sorts	1or2
-Handler_mrr_init	1or2
 set join_cache_level= @join_cache_level_save;
 set join_buffer_size= @join_buffer_size_save;
 drop table t0, t1;

mysql-test/r/status.result

@@ -275,9 +275,6 @@ Variable_name	Value
 Handler_commit	0
 Handler_delete	0
 Handler_discover	0
-Handler_mrr_extra_key_sorts	0
-Handler_mrr_extra_rowid_sorts	0
-Handler_mrr_init	0
 Handler_prepare	0
 Handler_read_first	0
 Handler_read_key	4
@@ -300,7 +297,7 @@ Created_tmp_files	0
 Created_tmp_tables	2
 Handler_tmp_update	2
 Handler_tmp_write	7
-Rows_tmp_read	38
+Rows_tmp_read	35
 drop table t1;
 CREATE TABLE t1 (i int(11) DEFAULT NULL, KEY i (i) ) ENGINE=MyISAM;
 insert into t1 values (1),(2),(3),(4),(5);
@@ -313,9 +310,6 @@ Variable_name	Value
 Handler_commit	0
 Handler_delete	0
 Handler_discover	0
-Handler_mrr_extra_key_sorts	0
-Handler_mrr_extra_rowid_sorts	0
-Handler_mrr_init	0
 Handler_prepare	0
 Handler_read_first	0
 Handler_read_key	2

mysql-test/r/status_user.result

@@ -100,9 +100,6 @@ Variable_name	Value
 Handler_commit	19
 Handler_delete	1
 Handler_discover	0
-Handler_mrr_extra_key_sorts	0
-Handler_mrr_extra_rowid_sorts	0
-Handler_mrr_init	0
 Handler_prepare	18
 Handler_read_first	0
 Handler_read_key	3

sql/mysqld.cc

@@ -8284,9 +8284,12 @@ SHOW_VAR status_vars[]= {
   {"Handler_commit",           (char*) offsetof(STATUS_VAR, ha_commit_count), SHOW_LONG_STATUS},
   {"Handler_delete",           (char*) offsetof(STATUS_VAR, ha_delete_count), SHOW_LONG_STATUS},
   {"Handler_discover",         (char*) offsetof(STATUS_VAR, ha_discover_count), SHOW_LONG_STATUS},
+#if 0
+  /* Made 3 counters below temporarily invisible until we agree upon their names */
   {"Handler_mrr_extra_key_sorts",   (char*) offsetof(STATUS_VAR, ha_mrr_extra_key_sorts), SHOW_LONG_STATUS},
   {"Handler_mrr_extra_rowid_sorts", (char*) offsetof(STATUS_VAR, ha_mrr_extra_rowid_sorts), SHOW_LONG_STATUS},
   {"Handler_mrr_init",         (char*) offsetof(STATUS_VAR, ha_multi_range_read_init_count),  SHOW_LONG_STATUS},
+#endif
   {"Handler_prepare",          (char*) offsetof(STATUS_VAR, ha_prepare_count),  SHOW_LONG_STATUS},
   {"Handler_read_first",       (char*) offsetof(STATUS_VAR, ha_read_first_count), SHOW_LONG_STATUS},
   {"Handler_read_key",         (char*) offsetof(STATUS_VAR, ha_read_key_count), SHOW_LONG_STATUS},