diff --git a/mysql-test/suite/heap/heap_btree.result b/mysql-test/suite/heap/heap_btree.result
index 0f749386756..8c1c8217b6a 100644
--- a/mysql-test/suite/heap/heap_btree.result
+++ b/mysql-test/suite/heap/heap_btree.result
@@ -59,10 +59,10 @@ a
 869751
 select * from t1 where a in (869751,736494,226312,802616);
 a
-869751
-736494
 226312
+736494
 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
@@ -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
-869751
 802616
+869751
 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	ALL	uniq_id	NULL	NULL	NULL	5	Using where
+1	SIMPLE	t1	range	uniq_id	uniq_id	8	NULL	3	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
-869751
-736494
 226312
+736494
 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	ALL	uniq_id	NULL	NULL	NULL	5	Using where
+1	SIMPLE	t1	range	uniq_id	uniq_id	8	NULL	4	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/sql/opt_trace_context.h b/sql/opt_trace_context.h
index 2bcbbfdc536..f578a0c67ec 100644
--- a/sql/opt_trace_context.h
+++ b/sql/opt_trace_context.h
@@ -4,7 +4,7 @@
 #include "sql_array.h"
 
 class Opt_trace_context;
-class Opt_trace_info;
+struct Opt_trace_info;
 class Json_writer;
 
 class Opt_trace_stmt {