diff --git a/sql/handler.cc b/sql/handler.cc
index e65fd6d097d..12820a66cb9 100644
--- a/sql/handler.cc
+++ b/sql/handler.cc
@@ -517,8 +517,8 @@ int ha_commit_trans(THD *thd, THD_TRANS* trans)
       if ((error=ndbcluster_commit(thd,trans->ndb_tid)))
       {
 	if (error == -1)
-	  my_message_(ER_ERROR_DURING_COMMIT, ER(ER_ERROR_DURING_COMMIT),
-                      MYF(0));
+	  my_message(ER_ERROR_DURING_COMMIT, ER(ER_ERROR_DURING_COMMIT),
+		     MYF(0));
         error=1;
       }
       if (trans == &thd->transaction.all)
diff --git a/sql/sql_acl.cc b/sql/sql_acl.cc
index 4c6ba829793..036ccb91260 100644
--- a/sql/sql_acl.cc
+++ b/sql/sql_acl.cc
@@ -3985,8 +3985,10 @@ int fill_schema_user_privileges(THD *thd, TABLE_LIST *tables, COND *cond)
       }
     }
   }
-#endif
   DBUG_RETURN(0);
+#else
+  return(0);
+#endif
 }
 
 
@@ -4033,8 +4035,10 @@ int fill_schema_schema_privileges(THD *thd, TABLE_LIST *tables, COND *cond)
       }
     }
   }
-#endif
   DBUG_RETURN(0);
+#else
+  return (0);
+#endif
 }
 
 
@@ -4078,8 +4082,10 @@ int fill_schema_table_privileges(THD *thd, TABLE_LIST *tables, COND *cond)
       }
     }
   }
-#endif
   DBUG_RETURN(0);
+#else
+  return (0);
+#endif
 }
 
 
@@ -4135,8 +4141,10 @@ int fill_schema_column_privileges(THD *thd, TABLE_LIST *tables, COND *cond)
       }
     }
   }
-#endif
   DBUG_RETURN(0);
+#else
+  return (0);
+#endif
 }