5.3 merge

1 files changed, 9 insertions, 24 deletions

diff --git a/mysql-test/r/myisam_icp.result b/mysql-test/r/myisam_icp.result
index a9b0dba3fb9..f1a2af264a3 100644
--- a/mysql-test/r/myisam_icp.result
+++ b/mysql-test/r/myisam_icp.result
@@ -820,24 +820,24 @@ KEY (c1)
 );
 INSERT INTO t1 VALUES ('3', '3'),('4','4'),('5','5');
 flush status;
-show status like "Handler_pushed%";
+show status like "Handler_icp%";
 Variable_name	Value
-Handler_pushed_index_cond_checks	0
-Handler_pushed_index_cond_filtered	0
+Handler_icp_attempts 	0
+Handler_icp_match	0
 SELECT * FROM t1 FORCE INDEX(c1) WHERE (c1='3' or c1='4') and c1 % 2 = 0 ;
 c1	c2
 4	4
-show status like "Handler_pushed%";
+show status like "Handler_icp%";
 Variable_name	Value
-Handler_pushed_index_cond_checks	2
-Handler_pushed_index_cond_filtered	1
+Handler_icp_attempts 	2
+Handler_icp_match	1
 SELECT * FROM t1 WHERE (c2='3' or c2='4') and c2 % 2 = 0 ;
 c1	c2
 4	4
-show status like "Handler_pushed%";
+show status like "Handler_icp%";
 Variable_name	Value
-Handler_pushed_index_cond_checks	2
-Handler_pushed_index_cond_filtered	1
+Handler_icp_attempts 	2
+Handler_icp_match	1
 DROP TABLE t1;
 drop table if exists t0, t1, t1i, t1m;
 #
@@ -914,19 +914,4 @@ Warning	1292	Truncated incorrect DOUBLE value: 'c'
 Warning	1292	Truncated incorrect DOUBLE value: 'c'
 SET optimizer_switch=@save_optimizer_switch;
 DROP TABLE t1,t2,t3,t4;
-#
-# BUG#933412: Server crashes in _mi_put_key_in_record on KILL QUERY with ICP, STRAIGHT_JOIN 
-#
-CREATE TABLE t1 (
-b INT,
-c VARCHAR(1) NOT NULL,
-d DATETIME,
-KEY (c, b)
-) ENGINE=MyISAM;
-# INSERT some data
-CREATE TABLE t2 ( a INT ) ENGINE=MyISAM;
-INSERT INTO t2 VALUES
-(7),(3),(7),(3);
-# Now run a number of ICP queries while trying to kill them
-DROP TABLE t1,t2;
 set optimizer_switch=@myisam_icp_tmp;