MDEV-16188 Post-merge corrections and adjustments

3 files changed, 15 insertions, 15 deletions

diff --git a/mysql-test/suite/heap/heap.result b/mysql-test/suite/heap/heap.result
index 320966dd571..326142a71a4 100644
--- a/mysql-test/suite/heap/heap.result
+++ b/mysql-test/suite/heap/heap.result
@@ -66,7 +66,7 @@ a
 alter table t1 engine=myisam;
 explain select * from t1 where a in (869751,736494,226312,802616);
 id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra
-1	SIMPLE	t1	range	uniq_id	uniq_id	4	NULL	4	Using where; Using index
+1	SIMPLE	t1	index	uniq_id	uniq_id	4	NULL	5	Using where; Using index
 drop table t1;
 create table t1 (x int not null, y int not null, key x (x), unique y (y))
 engine=heap;
diff --git a/mysql-test/suite/heap/heap_btree.result b/mysql-test/suite/heap/heap_btree.result
index 83d1bcb6c92..28292d980c0 100644
--- a/mysql-test/suite/heap/heap_btree.result
+++ b/mysql-test/suite/heap/heap_btree.result
@@ -48,8 +48,8 @@ a
 alter table t1 add unique uniq_id using BTREE (a);
 select * from t1 where a > 736494;
 a
-802616
 869751
+802616
 select * from t1 where a = 736494;
 a
 736494
@@ -59,14 +59,14 @@ a
 869751
 select * from t1 where a in (869751,736494,226312,802616);
 a
-226312
+869751
 736494
+226312
 802616
-869751
 alter table t1 engine=myisam;
 explain select * from t1 where a in (869751,736494,226312,802616);
 id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra
-1	SIMPLE	t1	range	uniq_id	uniq_id	4	NULL	4	Using where; Using index
+1	SIMPLE	t1	index	uniq_id	uniq_id	4	NULL	5	Using where; Using index
 drop table t1;
 create table t1 (x int not null, y int not null, key x  using BTREE (x,y), unique y  using BTREE (y))
 engine=heap;
@@ -178,7 +178,7 @@ id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra
 1	SIMPLE	t1	range	btn	btn	10	NULL	1	Using where
 explain select * from t1 where btn like "h%";
 id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra
-1	SIMPLE	t1	range	btn	btn	10	NULL	#	Using where
+1	SIMPLE	t1	ALL	btn	NULL	NULL	NULL	#	Using where
 explain select * from t1 where btn like "a%";
 id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra
 1	SIMPLE	t1	range	btn	btn	10	NULL	1	Using where
@@ -350,11 +350,11 @@ insert into t1 values (869751),(736494),(226312),(802616),(728912);
 alter table t1 add unique uniq_id using BTREE (a);
 select 0+a from t1 where a > 736494;
 0+a
-802616
 869751
+802616
 explain select 0+a from t1 where a > 736494;
 id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra
-1	SIMPLE	t1	range	uniq_id	uniq_id	8	NULL	3	Using where
+1	SIMPLE	t1	ALL	uniq_id	NULL	NULL	NULL	5	Using where
 select 0+a from t1 where a = 736494;
 0+a
 736494
@@ -370,13 +370,13 @@ id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra
 1	SIMPLE	t1	range	uniq_id	uniq_id	8	NULL	2	Using where
 select 0+a from t1 where a in (869751,736494,226312,802616);
 0+a
-226312
+869751
 736494
+226312
 802616
-869751
 explain select 0+a from t1 where a in (869751,736494,226312,802616);
 id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra
-1	SIMPLE	t1	range	uniq_id	uniq_id	8	NULL	4	Using where
+1	SIMPLE	t1	ALL	uniq_id	NULL	NULL	NULL	5	Using where
 drop table t1;
 End of 5.3 tests
 create table t1 (id int, a varchar(300) not null, key using btree(a)) engine=heap;
diff --git a/mysql-test/suite/heap/heap_hash.result b/mysql-test/suite/heap/heap_hash.result
index 55d43588403..4f9682769bf 100644
--- a/mysql-test/suite/heap/heap_hash.result
+++ b/mysql-test/suite/heap/heap_hash.result
@@ -66,7 +66,7 @@ a
 alter table t1 engine=myisam;
 explain select * from t1 where a in (869751,736494,226312,802616);
 id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra
-1	SIMPLE	t1	range	uniq_id	uniq_id	4	NULL	4	Using where; Using index
+1	SIMPLE	t1	index	uniq_id	uniq_id	4	NULL	5	Using where; Using index
 drop table t1;
 create table t1 (x int not null, y int not null, key x  using HASH (x), unique y  using HASH (y))
 engine=heap;
@@ -428,13 +428,13 @@ id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra
 1	SIMPLE	t1	range	uniq_id	uniq_id	8	NULL	2	Using where
 select 0+a from t1 where a in (869751,736494,226312,802616);
 0+a
-226312
+869751
 736494
+226312
 802616
-869751
 explain select 0+a from t1 where a in (869751,736494,226312,802616);
 id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra
-1	SIMPLE	t1	range	uniq_id	uniq_id	8	NULL	4	Using where
+1	SIMPLE	t1	ALL	uniq_id	NULL	NULL	NULL	5	Using where
 drop table t1;
 End of 5.3 tests
 #