5.3 merge

1 files changed, 15 insertions, 0 deletions

diff --git a/mysql-test/r/myisam_mrr.result b/mysql-test/r/myisam_mrr.result
index 01d3e6aeb5d..0da0f8fd5eb 100644
--- a/mysql-test/r/myisam_mrr.result
+++ b/mysql-test/r/myisam_mrr.result
@@ -563,6 +563,9 @@ drop table t1;
 flush status;
 show status like 'Handler_mrr%';
 Variable_name	Value
+Handler_mrr_init	0
+Handler_mrr_key_refills	0
+Handler_mrr_rowid_refills	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));
@@ -578,6 +581,9 @@ sum(b)
 1230
 show status like 'handler_mrr%';
 Variable_name	Value
+Handler_mrr_init	1
+Handler_mrr_key_refills	0
+Handler_mrr_rowid_refills	0
 set @mrr_buffer_size_save= @@mrr_buffer_size;
 set mrr_buffer_size=128;
 explain select sum(b) from t1 where a < 1600;
@@ -590,6 +596,9 @@ sum(b)
 196800
 show status like 'handler_mrr%';
 Variable_name	Value
+Handler_mrr_init	1
+Handler_mrr_key_refills	0
+Handler_mrr_rowid_refills	1
 set @@mrr_buffer_size= @mrr_buffer_size_save;
 #Now, let's check BKA: 
 set @join_cache_level_save= @@join_cache_level;
@@ -605,6 +614,9 @@ sum(t1.b)
 1230
 show status like 'handler_mrr%';
 Variable_name	Value
+Handler_mrr_init	1
+Handler_mrr_key_refills	0
+Handler_mrr_rowid_refills	0
 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
@@ -616,6 +628,9 @@ sum(t1.b)
 1230
 show status like 'handler_mrr%';
 Variable_name	Value
+Handler_mrr_init	2
+Handler_mrr_key_refills	3
+Handler_mrr_rowid_refills	3
 set join_cache_level= @join_cache_level_save;
 set join_buffer_size= @join_buffer_size_save;
 drop table t0, t1;