diff --git a/mysql-test/main/myisam_mrr,32bit.rdiff b/mysql-test/main/myisam_mrr,32bit.rdiff new file mode 100644 index 00000000000..746bf48dedd --- /dev/null +++ b/mysql-test/main/myisam_mrr,32bit.rdiff @@ -0,0 +1,13 @@ +--- main/myisam_mrr.result 2019-05-14 15:44:52.232663568 +0530 ++++ main/myisam_mrr.reject 2019-05-14 15:51:37.123563538 +0530 +@@ -617,8 +617,8 @@ + show status like 'handler_mrr%'; + Variable_name Value + Handler_mrr_init 1 +-Handler_mrr_key_refills 1 +-Handler_mrr_rowid_refills 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 diff --git a/mysql-test/main/myisam_mrr,64bit.rdiff b/mysql-test/main/myisam_mrr,64bit.rdiff deleted file mode 100644 index feb97548ad8..00000000000 --- a/mysql-test/main/myisam_mrr,64bit.rdiff +++ /dev/null @@ -1,31 +0,0 @@ ---- main/myisam_mrr.result 2019-04-27 21:46:07.000000000 +0530 -+++ main/myisam_mrr,64bit.reject 2019-05-11 20:40:32.000000000 +0530 -@@ -188,7 +188,7 @@ - select * from t4 where a IS NULL and b IS NULL and (c IS NULL or c='no-such-row1' - or c='no-such-row2'); - id select_type table type possible_keys key key_len ref rows Extra --1 SIMPLE t4 range idx1 idx1 29 NULL 10 Using index condition; Using where; Rowid-ordered scan -+1 SIMPLE t4 range idx1 idx1 29 NULL 10 Using index condition; Rowid-ordered scan - select * from t4 where a IS NULL and b IS NULL and (c IS NULL or c='no-such-row1' - or c='no-such-row2'); - a b c filler -@@ -210,7 +210,7 @@ - explain - select * from t4 where (a ='b-1' or a='bb-1') and b IS NULL and (c='c-1' or c='cc-2'); - id select_type table type possible_keys key key_len ref rows Extra --1 SIMPLE t4 range idx1 idx1 29 NULL 20 Using index condition; Using where; Rowid-ordered scan -+1 SIMPLE t4 range idx1 idx1 29 NULL 20 Using index condition; Rowid-ordered scan - select * from t4 where (a ='b-1' or a='bb-1') and b IS NULL and (c='c-1' or c='cc-2'); - a b c filler - b-1 NULL c-1 NULL-15 -@@ -617,8 +617,8 @@ - show status like 'handler_mrr%'; - Variable_name Value - Handler_mrr_init 1 --Handler_mrr_key_refills 0 --Handler_mrr_rowid_refills 0 -+Handler_mrr_key_refills 1 -+Handler_mrr_rowid_refills 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 diff --git a/mysql-test/main/myisam_mrr.result b/mysql-test/main/myisam_mrr.result index 5d33b4d7ae8..873260bbc3a 100644 --- a/mysql-test/main/myisam_mrr.result +++ b/mysql-test/main/myisam_mrr.result @@ -617,8 +617,8 @@ sum(t1.b) show status like 'handler_mrr%'; Variable_name Value Handler_mrr_init 1 -Handler_mrr_key_refills 0 -Handler_mrr_rowid_refills 0 +Handler_mrr_key_refills 1 +Handler_mrr_rowid_refills 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