misc test/result fixes

mysql-test/include/have_xtradb.combinations:
  xtradb tests need this I_S table
mysql-test/lib/mtr_cases.pm:
  fix for .deb and .rpm installations

1 files changed, 22 insertions, 58 deletions

diff --git a/mysql-test/r/innodb_icp,innodb_plugin.rdiff b/mysql-test/r/innodb_icp,innodb_plugin.rdiff
index bf598d64cd5..08e16944fba 100644
--- a/mysql-test/r/innodb_icp,innodb_plugin.rdiff
+++ b/mysql-test/r/innodb_icp,innodb_plugin.rdiff
@@ -1,14 +1,5 @@
---- r/innodb_icp.result	2012-01-09 16:13:21.000000000 +0100
-+++ r/innodb_icp.reject	2012-02-07 12:45:59.000000000 +0100
-@@ -167,7 +167,7 @@
- ORDER BY ts DESC
- LIMIT 2;
- id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra
--1	SIMPLE	t1	range	PRIMARY	PRIMARY	4	NULL	4	Using index condition
-+1	SIMPLE	t1	range	PRIMARY	PRIMARY	4	NULL	4	Using where
- 
- DROP TABLE t1;
- #
+--- r/innodb_icp.result	2012-02-25 17:31:11.000000000 +0100
++++ /usr/home/serg/Abk/mysql/5.5-mtr/mysql-test/r/innodb_icp,innodb_plugin.reject	2012-02-25 22:32:18.000000000 +0100
 @@ -213,7 +213,7 @@
  EXPLAIN
  SELECT c1 FROM t3 WHERE c1 >= 'c-1004=w' and c1 <= 'c-1006=w' and i1 > 2;
@@ -18,35 +9,6 @@
  SELECT c1 FROM t3 WHERE c1 >= 'c-1004=w' and c1 <= 'c-1006=w' and i1 > 2;
  c1
  EXPLAIN
-@@ -431,7 +431,7 @@
- WHERE pk IN (SELECT it.pk FROM t2 JOIN t2 AS it ON it.i=it.i WHERE it.pk-t1.i<10);
- id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra
- 1	PRIMARY	t1	ALL	NULL	NULL	NULL	NULL	3	Using where
--2	DEPENDENT SUBQUERY	it	eq_ref	PRIMARY	PRIMARY	4	func	1	Using index condition
-+2	DEPENDENT SUBQUERY	it	eq_ref	PRIMARY	PRIMARY	4	func	1	Using where
- 2	DEPENDENT SUBQUERY	t2	index	NULL	PRIMARY	4	NULL	3	Using where; Using index; Using join buffer (flat, BNL join)
- SELECT * FROM t1
- WHERE pk IN (SELECT it.pk FROM t2 JOIN t2 AS it ON it.i=it.i WHERE it.pk-t1.i<10);
-@@ -452,7 +452,7 @@
- INSERT INTO t1 VALUES (1,9),(2,7),(3,6),(4,3),(5,1);
- EXPLAIN SELECT pk, c1 FROM t1 WHERE pk <> 3;
- id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra
--1	SIMPLE	t1	range	PRIMARY	PRIMARY	4	NULL	4	Using index condition
-+1	SIMPLE	t1	range	PRIMARY	PRIMARY	4	NULL	4	Using where
- SET SESSION optimizer_switch='index_condition_pushdown=off';
- SELECT pk, c1 FROM t1 WHERE pk <> 3;
- pk	c1
-@@ -507,8 +507,8 @@
- WHERE (t2.pk <= 4 AND t1.pk IN (2,1)) OR
- (t1.pk > 1 AND t2.pk BETWEEN 6 AND 6);
- id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra
--1	SIMPLE	t1	range	PRIMARY	PRIMARY	4	NULL	1	Using index condition; Using where
--1	SIMPLE	t2	range	PRIMARY	PRIMARY	4	NULL	2	Using index condition; Using where; Using join buffer (flat, BNL join)
-+1	SIMPLE	t1	range	PRIMARY	PRIMARY	4	NULL	1	Using where
-+1	SIMPLE	t2	range	PRIMARY	PRIMARY	4	NULL	2	Using where; Using join buffer (flat, BNL join)
- SELECT c2 FROM t1 JOIN t2 ON t1.c1 = t2.c1
- WHERE (t2.pk <= 4 AND t1.pk IN (2,1)) OR
- (t1.pk > 1 AND t2.pk BETWEEN 6 AND 6);
 @@ -637,7 +637,7 @@
  WHERE NOT(b = 'Texas') AND b BETWEEN 'wy' AND 'y' OR b = 'Pennsylvania'
    ORDER BY a;
@@ -65,21 +27,23 @@
  SELECT * FROM t1 
  WHERE NOT(b = 'Texas') AND b BETWEEN 'wy' AND 'y' OR b = 'Pennsylvania'
    ORDER BY a;
-@@ -680,7 +680,7 @@
- SELECT t1.b, t1.c FROM t1, t2 WHERE t1.a = t2.a AND t1.b != 0
- HAVING t1.c != 5 ORDER BY t1.c;
- id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra
--1	SIMPLE	t1	range	PRIMARY	PRIMARY	4	NULL	2	Using index condition; Using where; Using filesort
-+1	SIMPLE	t1	range	PRIMARY	PRIMARY	4	NULL	2	Using where; Using filesort
- 1	SIMPLE	t2	ref	a	a	515	test.t1.a	1	Using where
- SELECT t1.b, t1.c FROM t1, t2 WHERE t1.a = t2.a AND t1.b != 0
- HAVING t1.c != 5 ORDER BY t1.c;
-@@ -793,7 +793,7 @@
- 1	PRIMARY	t	ALL	PRIMARY,c	NULL	NULL	NULL	64	Using where
- 1	PRIMARY	t2	ref	g	g	5	test.t.c	9	Using where
- 2	DEPENDENT SUBQUERY	t1	index	PRIMARY	d	3	NULL	64	Using where; Using index
--2	DEPENDENT SUBQUERY	t2	eq_ref	PRIMARY	PRIMARY	4	test.t1.a	1	Using index condition; Using where
-+2	DEPENDENT SUBQUERY	t2	eq_ref	PRIMARY	PRIMARY	4	test.t1.a	1	Using where
- SELECT COUNT(*) FROM t1 AS t, t2
- WHERE c = g
- AND (EXISTS (SELECT * FROM t1, t2 WHERE a = f  AND h <= t.e AND a > t.b)
+@@ -825,15 +825,15 @@
+ 4	4
+ show status like "Handler_icp%";
+ Variable_name	Value
+-Handler_icp_attempts 	2
+-Handler_icp_match	1
++Handler_icp_attempts 	0
++Handler_icp_match	0
+ SELECT * FROM t1 WHERE (c2='3' or c2='4') and c2 % 2 = 0 ;
+ c1	c2
+ 4	4
+ show status like "Handler_icp%";
+ Variable_name	Value
+-Handler_icp_attempts 	2
+-Handler_icp_match	1
++Handler_icp_attempts 	0
++Handler_icp_match	0
+ DROP TABLE t1;
+ #
+ # BUG#920132: Assert trx->n_active_thrs == 1 failed at que0que.c line 1050