diff --git a/client/mysqlcheck.c b/client/mysqlcheck.c
index 7822460e341..6abf9a0d82e 100644
--- a/client/mysqlcheck.c
+++ b/client/mysqlcheck.c
@@ -910,10 +910,10 @@ static int dbConnect(char *host, char *user, char *passwd)
                                        opt_ssl_mode == SSL_MODE_REQUIRED)))
   {
     DBerror(&mysql_connection, "when trying to connect");
-    return 1;
+    DBUG_RETURN(1);
   }
   mysql_connection.reconnect= 1;
-  return 0;
+  DBUG_RETURN(0);
 } /* dbConnect */
 
 
diff --git a/mysys/default.c b/mysys/default.c
index 75274f25edf..e66ce12c4c1 100644
--- a/mysys/default.c
+++ b/mysys/default.c
@@ -642,7 +642,7 @@ int my_load_defaults(const char *conf_file, const char **groups,
  err:
   fprintf(stderr,"Fatal error in defaults handling. Program aborted\n");
   exit(1);
-  return 0;					/* Keep compiler happy */
+  DBUG_RETURN(0); /* Keep compiler happy */
 }