diff --git a/client/mysqltest.c b/client/mysqltest.c
index 074eeb0fac4..f6dea1d6b3e 100644
--- a/client/mysqltest.c
+++ b/client/mysqltest.c
@@ -6730,7 +6730,7 @@ int reg_replace(char** buf_p, int* buf_len_p, char *pattern,
           if ((start_off=subs[back_ref_num].rm_so) > -1 &&
               (end_off=subs[back_ref_num].rm_eo) > -1)
           {
-            int block_len= end_off - start_off;
+            int block_len= (int) (end_off - start_off);
             memcpy(res_p,str_p + start_off, block_len);
             res_p += block_len;
           }
diff --git a/support-files/compiler_warnings.supp b/support-files/compiler_warnings.supp
index 46f706198c0..a147255f9a4 100644
--- a/support-files/compiler_warnings.supp
+++ b/support-files/compiler_warnings.supp
@@ -48,6 +48,7 @@ dbm.c : .*'item.dsize' is used uninitialized in this function.*
 .* : conversion from '.*size_t' to 'uint32'.*
 .* : conversion from '.*size_t' to 'off_t'.*
 .* : conversion from '.*size_t' to 'size_s'.*
+.* : conversion from 'u?lint' to 'int'.*
 ha_berkeley.cc : .*conversion from 'ulonglong' to 'char'.*
 
 #
@@ -74,4 +75,5 @@ mi_packrec.c : .*result of 32-bit shift implicitly converted to 64 bits.* : 567
 # in 5.0. Please do not merge upwards.
 #
 socket_wrapper.cpp : .*truncation of constant value.*
+socket_wrapper.hpp : .*truncation of constant value.*
 viossl.c : .*conversion from 'SOCKET' to 'socket_t'.*