diff options
Diffstat (limited to 'mysql-test/main/innodb_ext_key,off.rdiff')
| -rw-r--r-- | mysql-test/main/innodb_ext_key,off.rdiff | 36 |
1 files changed, 15 insertions, 21 deletions
diff --git a/mysql-test/main/innodb_ext_key,off.rdiff b/mysql-test/main/innodb_ext_key,off.rdiff index 75f5a3432b4..212a0b3f12e 100644 --- a/mysql-test/main/innodb_ext_key,off.rdiff +++ b/mysql-test/main/innodb_ext_key,off.rdiff @@ -1,20 +1,17 @@ ---- main/innodb_ext_key.result -+++ main/innodb_ext_key,off.reject +--- innodb_ext_key.result ++++ innodb_ext_key,off.reject @@ -9,7 +9,7 @@ explain select count(*) from lineitem where l_orderkey=130 and l_shipdate='1992-07-01'; id select_type table type possible_keys key key_len ref rows Extra -1 SIMPLE lineitem ref PRIMARY,i_l_shipdate,i_l_orderkey,i_l_orderkey_quantity i_l_shipdate 8 const,const 1 Using index -+1 SIMPLE lineitem index_merge PRIMARY,i_l_shipdate,i_l_orderkey,i_l_orderkey_quantity i_l_orderkey,i_l_shipdate 4,4 NULL 1 Using intersect(i_l_orderkey,i_l_shipdate); Using where; Using index ++1 SIMPLE lineitem ref PRIMARY,i_l_shipdate,i_l_orderkey,i_l_orderkey_quantity i_l_shipdate 4 const 6 Using where; Using index flush status; select count(*) from lineitem where l_orderkey=130 and l_shipdate='1992-07-01'; count(*) -@@ -17,9 +17,9 @@ - show status like 'handler_read%'; - Variable_name Value +@@ -19,7 +19,7 @@ Handler_read_first 0 --Handler_read_key 1 -+Handler_read_key 2 + Handler_read_key 1 Handler_read_last 0 -Handler_read_next 1 +Handler_read_next 6 @@ -98,16 +95,13 @@ where l_shipdate='1992-07-01' and l_orderkey=130; id select_type table type possible_keys key key_len ref rows Extra -1 SIMPLE NULL NULL NULL NULL NULL NULL NULL Select tables optimized away -+1 SIMPLE lineitem index_merge PRIMARY,i_l_shipdate,i_l_orderkey,i_l_orderkey_quantity i_l_orderkey,i_l_shipdate 4,4 NULL 1 Using intersect(i_l_orderkey,i_l_shipdate); Using where; Using index ++1 SIMPLE lineitem ref PRIMARY,i_l_shipdate,i_l_orderkey,i_l_orderkey_quantity i_l_shipdate 4 const 6 Using where; Using index flush status; select max(l_linenumber) from lineitem where l_shipdate='1992-07-01' and l_orderkey=130; -@@ -143,9 +143,9 @@ - show status like 'handler_read%'; - Variable_name Value +@@ -145,7 +145,7 @@ Handler_read_first 0 --Handler_read_key 1 -+Handler_read_key 2 + Handler_read_key 1 Handler_read_last 0 -Handler_read_next 0 +Handler_read_next 6 @@ -178,7 +172,7 @@ where l_partkey between 1 and 10 group by l_partkey; id select_type table type possible_keys key key_len ref rows Extra -1 SIMPLE lineitem range i_l_suppkey_partkey,i_l_partkey i_l_partkey 5 NULL # Using where; Using index for group-by -+1 SIMPLE lineitem range i_l_suppkey_partkey,i_l_partkey i_l_partkey 5 NULL # Using where; Using index ++1 SIMPLE lineitem range i_l_suppkey_partkey,i_l_partkey i_l_suppkey_partkey 5 NULL # Using where; Using index flush status; select max(l_orderkey) from lineitem where l_partkey between 1 and 10 group by l_partkey; @@ -236,17 +230,17 @@ Handler_read_retry 0 Handler_read_rnd 0 @@ -314,8 +314,8 @@ - select * from t0, part ignore index (primary) + select straight_join * from t0, part ignore index (primary) where p_partkey=t0.a and p_size=1; id select_type table type possible_keys key key_len ref rows Extra -1 SIMPLE t0 ALL NULL NULL NULL NULL 5 Using where -1 SIMPLE part eq_ref i_p_size i_p_size 9 const,dbt3_s001.t0.a 1 +1 SIMPLE t0 ALL NULL NULL NULL NULL 5 +1 SIMPLE part ref i_p_size i_p_size 5 const 5 Using index condition - select * from t0, part ignore index (primary) + select straight_join * from t0, part ignore index (primary) where p_partkey=t0.a and p_size=1; a p_partkey p_name p_mfgr p_brand p_type p_size p_container p_retailprice p_comment -@@ -494,7 +494,7 @@ +@@ -495,7 +495,7 @@ select * from t1, t3 where t3.col1=t1.a and t3.col2=t1.a and t3.pk1=t1.a; id select_type table type possible_keys key key_len ref rows Extra 1 SIMPLE t1 ALL NULL NULL NULL NULL # Using where @@ -255,7 +249,7 @@ drop table t1,t2,t3; # # Bug mdev-4340: performance regression with extended_keys=on -@@ -725,13 +725,13 @@ +@@ -726,13 +726,13 @@ select * from t1 force index(index_date_updated) where index_date_updated= 10 and index_id < 800; id select_type table type possible_keys key key_len ref rows Extra @@ -271,7 +265,7 @@ drop table t0,t1,t2; # # MDEV-11196: Error:Run-Time Check Failure #2 - Stack around the variable 'key_buff' -@@ -766,13 +766,14 @@ +@@ -767,13 +767,14 @@ "select_id": 1, "table": { "table_name": "t1", @@ -290,7 +284,7 @@ "index_condition": "t1.pk1 <= 5 and t1.pk2 <= 5 and t1.f2 = 'abc'", "attached_condition": "t1.f1 <= '3'" } -@@ -799,8 +800,8 @@ +@@ -800,8 +801,8 @@ "access_type": "range", "possible_keys": ["k1"], "key": "k1", |