diff --git a/sql/item_func.cc b/sql/item_func.cc
index 7d00e868baea6..a3b2027f2fc9e 100644
--- a/sql/item_func.cc
+++ b/sql/item_func.cc
@@ -3651,6 +3651,7 @@ longlong Item_master_gtid_wait::val_int()
 {
   DBUG_ASSERT(fixed == 1);
   longlong result= 0;
+  String *gtid_pos __attribute__((unused)) = args[0]->val_str(&value);
 
   if (args[0]->null_value)
   {
@@ -3660,7 +3661,6 @@ longlong Item_master_gtid_wait::val_int()
 
   null_value=0;
 #ifdef HAVE_REPLICATION
-  String *gtid_pos = args[0]->val_str(&value);
   THD* thd= current_thd;
   longlong timeout_us;
 
@@ -3670,7 +3670,9 @@ longlong Item_master_gtid_wait::val_int()
     timeout_us= (longlong)-1;
 
   result= rpl_global_gtid_waiting.wait_for_pos(thd, gtid_pos, timeout_us);
-#endif
+#else
+  null_value= 0;
+#endif /* REPLICATION */
   return result;
 }
 
diff --git a/sql/sql_parse.cc b/sql/sql_parse.cc
index 00f009feb4ad5..9b615c2f1e739 100644
--- a/sql/sql_parse.cc
+++ b/sql/sql_parse.cc
@@ -1288,7 +1288,8 @@ bool do_command(THD *thd)
       mysql_mutex_lock(&thd->LOCK_wsrep_thd);
       if (thd->wsrep_conflict_state == MUST_ABORT)
       {
-        DBUG_PRINT("wsrep",("aborted for wsrep rollback: %lu", thd->real_id));
+        DBUG_PRINT("wsrep",("aborted for wsrep rollback: %lu",
+                            (ulong) thd->real_id));
         wsrep_client_rollback(thd);
       }
       mysql_mutex_unlock(&thd->LOCK_wsrep_thd);
diff --git a/sql/wsrep_mysqld.cc b/sql/wsrep_mysqld.cc
index e64ce00cd4741..2854a9b162a3f 100644
--- a/sql/wsrep_mysqld.cc
+++ b/sql/wsrep_mysqld.cc
@@ -1945,7 +1945,7 @@ static bool abort_replicated(THD *thd)
   bool ret_code= false;
   if (thd->wsrep_query_state== QUERY_COMMITTING)
   {
-    WSREP_DEBUG("aborting replicated trx: %lu", thd->real_id);
+    WSREP_DEBUG("aborting replicated trx: %lu", (ulong) thd->real_id);
 
     (void)wsrep_abort_thd(thd, thd, TRUE);
     ret_code= true;
diff --git a/storage/connect/jmgoconn.cpp b/storage/connect/jmgoconn.cpp
index cb0729ed1f7cb..62932f28c01bf 100644
--- a/storage/connect/jmgoconn.cpp
+++ b/storage/connect/jmgoconn.cpp
@@ -730,7 +730,7 @@ int JMgoConn::DocUpdate(PGLOBAL g, PTDB tdbp)
 			return RC_FX;
 
 		if (env->CallBooleanMethod(job, docaddid, updlist, jkey, val))
-			return NULL;
+			return 0;
 
 		env->DeleteLocalRef(jkey);
 	}	// endfor colp
@@ -740,7 +740,7 @@ int JMgoConn::DocUpdate(PGLOBAL g, PTDB tdbp)
 	jkey = env->NewStringUTF("$set");
 
 	if (env->CallBooleanMethod(job, docaddid, upd, jkey, updlist))
-		return NULL;
+		return 0;
 
 	env->DeleteLocalRef(jkey);
 
diff --git a/storage/connect/myconn.cpp b/storage/connect/myconn.cpp
index e68489faad5c7..55c98458530b2 100644
--- a/storage/connect/myconn.cpp
+++ b/storage/connect/myconn.cpp
@@ -139,7 +139,7 @@ PQRYRES MyColumns(PGLOBAL g, THD *thd, const char *host, const char *db,
 	unsigned int length[] = {0, 4, 0, 4, 4, 4, 4, 4, 0, 0, 0, 0, 0};
 	PCSZ    fmt;
 	char   *fld, *colname, *chset, v, buf[128], uns[16], zero[16];
-  int     i, n, nf, ncol = sizeof(buftyp) / sizeof(int);
+  int     i, n, nf=0, ncol = sizeof(buftyp) / sizeof(int);
   int     len, type, prec, rc, k = 0;
 	bool    b;
   PQRYRES qrp;
diff --git a/support-files/compiler_warnings.supp b/support-files/compiler_warnings.supp
index 6b4a72f9603ba..cfda98de86d5c 100644
--- a/support-files/compiler_warnings.supp
+++ b/support-files/compiler_warnings.supp
@@ -146,6 +146,8 @@
 .*/storage/connect/xindex\.cpp: ignoring return value of
 .*/storage/connect/value\.cpp: always false : 1000-1020
 .*/storage/connect/json\.cpp: might be clobbered by
+.*/storage/connect/filemdbf\.cpp: ignoring return value.*fwrite
+.*/storage/connect/value\.cpp: .*comparison is always false due to limited range
 
 #
 # mroonga