Fixed build failures with maria3.test and widows build

mysql-test/suite/maria/t/maria3.test:
  Fix when compiling with safemalloc
storage/maria/ha_maria.cc:
  Fix that MAX_FILE_SIZE is not limited on 32 bit machines.

mysql-test/suite/maria/t/maria3.test

@@ -260,7 +260,7 @@ check table t1 extended;
 drop table t1;
 
 # Fix if we are using safemalloc
---replace_result 8388572 8388600
+--replace_result 8388572 8388600 134217692 134217720
 select lower(variable_name) as Variable_name, Variable_value as Value from information_schema.session_variables where variable_name like "aria%" and variable_name not like "aria_used_for_temp_tables" order by 1;
 --replace_column 2 #
 show status like 'aria%';

storage/maria/CMakeLists.txt

@@ -40,7 +40,7 @@ SET(ARIA_SOURCES ma_init.c ma_open.c ma_extra.c ma_info.c ma_rkey.c
             ha_maria.cc trnman.c lockman.c tablockman.c 
             ma_rt_index.c ma_rt_key.c ma_rt_mbr.c ma_rt_split.c 
             ma_sp_key.c ma_control_file.c ma_loghandler.c 
-            ma_pagecache.c ma_pagecaches.c compat_aliases.cc compat_aliases.h
+            ma_pagecache.c ma_pagecaches.c
             ma_checkpoint.c ma_recovery.c ma_commit.c ma_pagecrc.c
             ha_maria.h maria_def.h ma_recovery_util.c ma_servicethread.c
             ma_norec.c

storage/maria/ha_maria.cc

@@ -212,7 +212,8 @@ static MYSQL_SYSVAR_ULONGLONG(max_sort_file_size,
        maria_max_temp_length, PLUGIN_VAR_RQCMDARG,
        "Don't use the fast sort index method to created index if the "
        "temporary file would get bigger than this.",
-       0, 0, MAX_FILE_SIZE & ~(1*MB-1), 0, MAX_FILE_SIZE, 1*MB);
+       0, 0, MAX_FILE_SIZE & ~((ulonglong) (1*MB-1)),
+       0, MAX_FILE_SIZE, 1*MB);
 
 static MYSQL_SYSVAR_ULONG(pagecache_age_threshold,
        pagecache_age_threshold, PLUGIN_VAR_RQCMDARG,