diff --git a/sql/sql_prepare.cc b/sql/sql_prepare.cc
index 522879c863a..da62fc0a262 100644
--- a/sql/sql_prepare.cc
+++ b/sql/sql_prepare.cc
@@ -72,7 +72,7 @@ Long data handling:
 #include "sql_select.h" // for JOIN
 #include <m_ctype.h>  // for isspace()
 
-#define IS_PARAM_NULL(pos, param_no) pos[param_no/8] & (1 << param_no & 7)
+#define IS_PARAM_NULL(pos, param_no) (pos[param_no/8] & (1 << (param_no & 7)))
 
 #define STMT_QUERY_LOG_LENGTH 8192
 
diff --git a/tests/client_test.c b/tests/client_test.c
index d6c4fb78ef9..fd9eb380228 100644
--- a/tests/client_test.c
+++ b/tests/client_test.c
@@ -8145,9 +8145,8 @@ int main(int argc, char **argv)
     test_ts();              /* test for timestamp BR#819 */
     test_bug1115();         /* BUG#1115 */
     test_bug1180();         /* BUG#1180 */
-#if NOT_YET_FIXED
     test_bug1644();	    /* BUG#1644 */
-#endif
+
     end_time= time((time_t *)0);
     total_time+= difftime(end_time, start_time);