--- r/null.result	2011-11-23 18:51:58.000000000 +0100
+++ r/null.reject	2012-02-10 16:12:44.000000000 +0100
@@ -148,10 +148,10 @@
 (7,7), (8,8), (9,9), (10,10), (11,11), (12,12);
 explain select * from t1 where a between 2 and 3;
 id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra
-1	SIMPLE	t1	range	idx	idx	4	NULL	2	Using index condition
+1	SIMPLE	t1	range	idx	idx	4	NULL	1	Using where
 explain select * from t1 where a between 2 and 3 or b is null;
 id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra
-1	SIMPLE	t1	range	idx	idx	4	NULL	2	Using index condition
+1	SIMPLE	t1	range	idx	idx	4	NULL	1	Using where
 drop table t1;
 select cast(NULL as signed);
 cast(NULL as signed)
@@ -170,7 +170,7 @@
 insert into t1 values(null);
 explain select * from t1 where i=2 or i is null;
 id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra
-1	SIMPLE	t1	ref_or_null	i	i	5	const	9	Using where; Using index
+1	SIMPLE	t1	ref_or_null	i	i	5	const	2	Using where; Using index
 select count(*) from t1 where i=2 or i is null;
 count(*)
 10
@@ -179,7 +179,7 @@
 Warning	1265	Data truncated for column 'i' at row 513
 explain select * from t1 where i=2 or i is null;
 id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra
-1	SIMPLE	t1	ref	i	i	4	const	7	Using index
+1	SIMPLE	t1	ref	i	i	4	const	25	Using index
 select count(*) from t1 where i=2 or i is null;
 count(*)
 9
@@ -265,7 +265,7 @@
   `c36` varchar(3) CHARACTER SET latin2 DEFAULT NULL,
   `c37` varchar(10) CHARACTER SET latin2 DEFAULT NULL,
   `c38` varchar(10) CHARACTER SET latin2 DEFAULT NULL
-) ENGINE=MyISAM DEFAULT CHARSET=latin1
+) ENGINE=PBXT DEFAULT CHARSET=latin1
 drop table t1;
 select 
 case 'str' when 'STR' then 'str' when null then 'null' end as c01,