Fixed failing tests in buildbot

- Updated icp_tests.inc and result files
- Updates usage of records_in_range() protype in cassandra

6 files changed, 20 insertions, 16 deletions

diff --git a/mysql-test/include/icp_tests.inc b/mysql-test/include/icp_tests.inc
index be892cf774b..bfa09e1c01e 100644
--- a/mysql-test/include/icp_tests.inc
+++ b/mysql-test/include/icp_tests.inc
@@ -731,6 +731,7 @@ INSERT INTO t2 VALUES
 insert into t2 select seq from seq_1_to_100;
 
 SET SESSION optimizer_switch='index_condition_pushdown=off';
+--replace_column 9 #
 EXPLAIN
 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;
@@ -738,6 +739,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;
 
 SET SESSION optimizer_switch='index_condition_pushdown=on';
+--replace_column 9 #
 EXPLAIN
 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;
diff --git a/mysql-test/main/innodb_icp.result b/mysql-test/main/innodb_icp.result
index 16d60ddba43..adf65780d21 100644
--- a/mysql-test/main/innodb_icp.result
+++ b/mysql-test/main/innodb_icp.result
@@ -692,8 +692,8 @@ EXPLAIN
 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	101	Using where; Using filesort
-1	SIMPLE	t2	ref	a	a	515	test.t1.a	1	Using where
+1	SIMPLE	t1	range	PRIMARY	PRIMARY	4	NULL	#	Using where; Using filesort
+1	SIMPLE	t2	ref	a	a	515	test.t1.a	#	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;
 b	c
@@ -703,8 +703,8 @@ EXPLAIN
 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	101	Using where; Using filesort
-1	SIMPLE	t2	ref	a	a	515	test.t1.a	1	Using where
+1	SIMPLE	t1	range	PRIMARY	PRIMARY	4	NULL	#	Using where; Using filesort
+1	SIMPLE	t2	ref	a	a	515	test.t1.a	#	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;
 b	c
diff --git a/mysql-test/main/myisam_icp.result b/mysql-test/main/myisam_icp.result
index 0ae18e6e817..f059c3f95e5 100644
--- a/mysql-test/main/myisam_icp.result
+++ b/mysql-test/main/myisam_icp.result
@@ -685,8 +685,8 @@ EXPLAIN
 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	ALL	PRIMARY	NULL	NULL	NULL	101	Using where; Using filesort
-1	SIMPLE	t2	ref	a	a	515	test.t1.a	10	Using where
+1	SIMPLE	t1	ALL	PRIMARY	NULL	NULL	NULL	#	Using where; Using filesort
+1	SIMPLE	t2	ref	a	a	515	test.t1.a	#	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;
 b	c
@@ -696,8 +696,8 @@ EXPLAIN
 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	ALL	PRIMARY	NULL	NULL	NULL	101	Using where; Using filesort
-1	SIMPLE	t2	ref	a	a	515	test.t1.a	10	Using where
+1	SIMPLE	t1	ALL	PRIMARY	NULL	NULL	NULL	#	Using where; Using filesort
+1	SIMPLE	t2	ref	a	a	515	test.t1.a	#	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;
 b	c
diff --git a/mysql-test/suite/maria/icp.result b/mysql-test/suite/maria/icp.result
index ad8b3b01dfe..149258de918 100644
--- a/mysql-test/suite/maria/icp.result
+++ b/mysql-test/suite/maria/icp.result
@@ -687,8 +687,8 @@ EXPLAIN
 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	ALL	PRIMARY	NULL	NULL	NULL	101	Using where; Using filesort
-1	SIMPLE	t2	ref	a	a	515	test.t1.a	10	Using where
+1	SIMPLE	t1	ALL	PRIMARY	NULL	NULL	NULL	#	Using where; Using filesort
+1	SIMPLE	t2	ref	a	a	515	test.t1.a	#	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;
 b	c
@@ -698,8 +698,8 @@ EXPLAIN
 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	ALL	PRIMARY	NULL	NULL	NULL	101	Using where; Using filesort
-1	SIMPLE	t2	ref	a	a	515	test.t1.a	10	Using where
+1	SIMPLE	t1	ALL	PRIMARY	NULL	NULL	NULL	#	Using where; Using filesort
+1	SIMPLE	t2	ref	a	a	515	test.t1.a	#	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;
 b	c
diff --git a/storage/cassandra/ha_cassandra.cc b/storage/cassandra/ha_cassandra.cc
index cf151bb0c6f..fc1c1bd3a2e 100644
--- a/storage/cassandra/ha_cassandra.cc
+++ b/storage/cassandra/ha_cassandra.cc
@@ -2527,8 +2527,9 @@ THR_LOCK_DATA **ha_cassandra::store_lock(THD *thd,
 }
 
 
-ha_rows ha_cassandra::records_in_range(uint inx, key_range *min_key,
-                                       key_range *max_key)
+ha_rows records_in_range(uint inx, const key_range *min_key,
+                         const key_range *max_key,
+                         page_range *res)
 {
   DBUG_ENTER("ha_cassandra::records_in_range");
   DBUG_RETURN(HA_POS_ERROR); /* Range scans are not supported */
diff --git a/storage/cassandra/ha_cassandra.h b/storage/cassandra/ha_cassandra.h
index a36d58fa4da..966fcc3e81b 100644
--- a/storage/cassandra/ha_cassandra.h
+++ b/storage/cassandra/ha_cassandra.h
@@ -258,8 +258,9 @@ public:
   void position(const uchar *record);                           ///< required
   int info(uint);                                               ///< required
   int delete_all_rows(void);
-  ha_rows records_in_range(uint inx, key_range *min_key,
-                           key_range *max_key);
+  ha_rows records_in_range(uint inx, const key_range *min_key,
+                           const key_range *max_key,
+                           page_range *res);
   int create(const char *name, TABLE *form,
              HA_CREATE_INFO *create_info);                      ///< required
   bool check_if_incompatible_data(HA_CREATE_INFO *info,