Fix test results

mysql-test/r/index_merge_ror_cpk.result:
  Portability fix
mysql-test/r/innodb.result:
  Update results
mysql-test/t/index_merge_ror_cpk.test:
  Portability fix

mysql-test/r/index_merge_ror_cpk.result

@@ -74,7 +74,7 @@ id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra
 1	SIMPLE	t1	index_merge	PRIMARY,key1,pktail2ok	pktail2ok,key1	8,4	NULL	199	Using sort_union(pktail2ok,key1); Using where
 explain select * from t1 where pktail3bad=1 and key1=10;
 id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra
-1	SIMPLE	t1	ref	key1,pktail3bad	pktail3bad	4	const	98	Using where
+1	SIMPLE	t1	ref	key1,pktail3bad	pktail3bad	4	const	ROWS	Using where
 explain select * from t1 where pktail4bad=1 and key1=10;
 id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra
 1	SIMPLE	t1	ref	key1,pktail4bad	pktail4bad	4	const	99	Using where

mysql-test/r/innodb.result

@@ -1696,7 +1696,7 @@ Variable_name	Value
 Innodb_rows_inserted	31706
 show status like "Innodb_rows_read";
 Variable_name	Value
-Innodb_rows_read	80161
+Innodb_rows_read	80178
 show status like "Innodb_rows_updated";
 Variable_name	Value
 Innodb_rows_updated	29530

mysql-test/t/index_merge_ror_cpk.test

@@ -72,6 +72,8 @@ explain select * from t1 where pktail2ok=1 and key1=10;
 select '  The following is actually a deficiency, it uses sort_union currently:' as 'note:';
 explain select * from t1 where (pktail2ok=1 and pk1< 50000) or key1=10;
 
+# The expected rows differs a bit from platform to platform
+--replace_result 98 ROWS 99 ROWS
 explain select * from t1 where pktail3bad=1 and key1=10;
 explain select * from t1 where pktail4bad=1 and key1=10;
 explain select * from t1 where pktail5bad=1 and key1=10;