diff --git a/myisam/mi_packrec.c b/myisam/mi_packrec.c
index 389def395cb..523cdadbbd3 100644
--- a/myisam/mi_packrec.c
+++ b/myisam/mi_packrec.c
@@ -563,7 +563,7 @@ static void fill_quick_table(uint16 *table, uint bits, uint max_bits,
   */
   value|= (max_bits - bits) << 8 | IS_CHAR;
 
-  for (end= table + ((uint) 1 << bits); table < end; table++)
+  for (end= table + (uint) (((uint) 1 << bits)); table < end; table++)
   {
     *table= (uint16) value;
   }
diff --git a/mysql-test/t/disabled.def b/mysql-test/t/disabled.def
index 9d6a9b57e9a..f77f73f419e 100644
--- a/mysql-test/t/disabled.def
+++ b/mysql-test/t/disabled.def
@@ -16,3 +16,6 @@ im_daemon_life_cycle : Bug#20294: Instance manager tests fail randomly
 im_options_set       : Bug#20294: Instance manager tests fail randomly
 im_options_unset     : Bug#20294: Instance manager tests fail randomly
 im_utils             : Bug#20294: Instance manager tests fail randomly
+grant_cache          : Bug#32651: grant_cache.test fails
+rpl_log              : Bug#32653: rpl_log.test fails randomly
+rpl_view             : Bug#32654: rpl_view.test fails randomly