COUNT(*) for merge can be longlong even if it's long for MyISAM

sql/ha_myisammrg.cc

@@ -184,8 +184,8 @@ void ha_myisammrg::info(uint flag)
 {
   MYMERGE_INFO info;
   (void) myrg_status(file,&info,flag);
-  records = (ha_rows) info.records;
-  deleted = (ha_rows) info.deleted;
+  records = info.records;
+  deleted = info.deleted;
   data_file_length=info.data_file_length;
   errkey  = info.errkey;
   table->keys_in_use= set_bits(key_map, table->keys);

sql/handler.h

@@ -192,8 +192,8 @@ class handler :public Sql_alloc
   byte *dupp_ref;			/* Pointer to dupp row */
   uint ref_length;			/* Length of ref (1-8) */
   uint block_size;			/* index block size */
-  ha_rows records;			/* Records i datafilen */
-  ha_rows deleted;			/* Deleted records */
+  ulonglong records;			/* Records i datafilen */
+  ulonglong deleted;			/* Deleted records */
   ulonglong data_file_length;		/* Length off data file */
   ulonglong max_data_file_length;	/* Length off data file */
   ulonglong index_file_length;