diff --git a/mysql-test/r/show_check.result b/mysql-test/r/show_check.result
index 7aaaca043fd..aefebad7e49 100644
--- a/mysql-test/r/show_check.result
+++ b/mysql-test/r/show_check.result
@@ -269,7 +269,6 @@ SET @old_sql_mode= @@sql_mode, sql_mode= '';
 SET @old_sql_quote_show_create= @@sql_quote_show_create, sql_quote_show_create= OFF;
 CREATE TABLE `a/b` (i INT);
 ERROR 42000: Incorrect table name 'a/b'
-SET sql_mode= 'ANSI_QUOTES';
 SET sql_mode= '';
 SET sql_quote_show_create= OFF;
 CREATE TABLE t1 (i INT);
@@ -401,10 +400,3 @@ where user='mysqltest_1' || user='mysqltest_2' || user='mysqltest_3';
 delete from mysql.db   
 where user='mysqltest_1' || user='mysqltest_2' || user='mysqltest_3';
 flush privileges;
-set names latin1;
-create database `ä`;
-create table `ä`.`ä` (a int) engine=heap;
-show table status from `ä` LIKE 'ä';
-Name	Engine	Version	Row_format	Rows	Avg_row_length	Data_length	Max_data_length	Index_length	Data_free	Auto_increment	Create_time	Update_time	Check_time	Collation	Checksum	Create_options	Comment
-ä	HEAP	9	Fixed	0	5	#	#	#	0	NULL	NULL	NULL	NULL	latin1_swedish_ci	NULL		
-drop database `ä`;
diff --git a/sql/opt_range.cc b/sql/opt_range.cc
index 81bbedf88da..e0192116853 100644
--- a/sql/opt_range.cc
+++ b/sql/opt_range.cc
@@ -1759,7 +1759,7 @@ double get_sweep_read_cost(const PARAM *param, ha_rows records)
   else
   {
     double n_blocks=
-      ceil((double)((longlong)param->table->file->data_file_length / IO_SIZE));
+      ceil((double)param->table->file->data_file_length / IO_SIZE);
     double busy_blocks=
       n_blocks * (1.0 - pow(1.0 - 1.0/n_blocks, rows2double(records)));
     if (busy_blocks < 1.0)