Update test results after the last cset.

mysql-test/r/innodb_icp,innodb_plugin.rdiff

---- 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
+--- r/innodb_icp.result	2013-07-16 17:01:00.000000000 +0400
++++ r/innodb_icp,innodb_plugin.reject	2013-07-16 17:16:53.000000000 +0400
 @@ -213,7 +213,7 @@
  EXPLAIN
  SELECT c1 FROM t3 WHERE c1 >= 'c-1004=w' and c1 <= 'c-1006=w' and i1 > 2;
@@ -45,5 +45,14 @@
 +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 
+ create table t1 (a int,b char(5),primary key (a), key (b(1)));
+ insert into t1 values ('a','b');
+@@ -868,7 +868,7 @@
+ EXPLAIN
+ SELECT * FROM t1 FORCE INDEX(idx1)       WHERE (c1='aa' AND c2='x') OR (c1='a'  AND c2='y');
+ id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra
+-1	SIMPLE	t1	range	idx1	idx1	10	NULL	2	Using index condition; Using where
++1	SIMPLE	t1	range	idx1	idx1	10	NULL	2	Using where
+ SELECT * FROM t1 FORCE INDEX(idx1)       WHERE (c1='aa' AND c2='x') OR (c1='a'  AND c2='y');
+ c1	c2
+ aa	x