diff options
| -rw-r--r-- | mysql-test/t/myisam_mrr.test | 5 | ||||
| -rw-r--r-- | sql/mysqld.cc | 4 |
2 files changed, 2 insertions, 7 deletions
diff --git a/mysql-test/t/myisam_mrr.test b/mysql-test/t/myisam_mrr.test index 3629a9cebed..28385c61b0f 100644 --- a/mysql-test/t/myisam_mrr.test +++ b/mysql-test/t/myisam_mrr.test @@ -272,7 +272,6 @@ drop table t1; --echo # Test of MRR handler counters --echo # flush status; ---sorted_result show status like 'Handler_mrr%'; create table t0 (a int); insert into t0 values (0),(1),(2),(3),(4),(5),(6),(7),(8),(9); @@ -284,7 +283,6 @@ explain select sum(b) from t1 where a < 10; --echo # This should show one MRR scan and no re-fills: flush status; select sum(b) from t1 where a < 10; ---sorted_result show status like 'handler_mrr%'; set @mrr_buffer_size_save= @@mrr_buffer_size; @@ -296,7 +294,6 @@ explain select sum(b) from t1 where a < 1600; --echo # This should show one MRR scan and one extra rowid sort: flush status; select sum(b) from t1 where a < 1600; ---sorted_result show status like 'handler_mrr%'; set @@mrr_buffer_size= @mrr_buffer_size_save; @@ -308,7 +305,6 @@ set join_cache_level=6; explain select sum(t1.b) from t0,t1 where t0.a=t1.a; flush status; select sum(t1.b) from t0,t1 where t0.a=t1.a; ---sorted_result show status like 'handler_mrr%'; --disable_warnings @@ -317,7 +313,6 @@ set join_buffer_size=10; explain select sum(t1.b) from t0,t1 where t0.a=t1.a; flush status; select sum(t1.b) from t0,t1 where t0.a=t1.a; ---sorted_result --replace_result 1 1or2 2 1or2 show status like 'handler_mrr%'; diff --git a/sql/mysqld.cc b/sql/mysqld.cc index 16254ead03f..a090448ebae 100644 --- a/sql/mysqld.cc +++ b/sql/mysqld.cc @@ -8288,9 +8288,9 @@ 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}, - {"Handler_mrr_init", (char*) offsetof(STATUS_VAR, ha_multi_range_read_init_count), SHOW_LONG_STATUS}, - {"Handler_mrr_extra_rowid_sorts", (char*) offsetof(STATUS_VAR, ha_mrr_extra_rowid_sorts), SHOW_LONG_STATUS}, {"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}, {"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}, |