diff --git a/sql/sql_db.cc b/sql/sql_db.cc
index 39c8c00898d..48c355b6cd9 100644
--- a/sql/sql_db.cc
+++ b/sql/sql_db.cc
@@ -18,6 +18,7 @@
 /* create and drop of databases */
 
 #include "mysql_priv.h"
+#include <mysys_err.h>
 #include "sql_acl.h"
 #include <my_dir.h>
 #include <m_ctype.h>
@@ -185,7 +186,7 @@ int mysql_create_db(THD *thd, char *db, HA_CREATE_INFO *create_info,
   strxmov(path, mysql_data_home, "/", db, NullS);
   unpack_dirname(path,path);			// Convert if not unix
 
-  if (my_stat(path,&stat_info,MYF(MY_WME)))
+  if (my_stat(path,&stat_info,MYF(0)))
   {
    if (!(create_options & HA_LEX_CREATE_IF_NOT_EXISTS))
     {
@@ -197,6 +198,11 @@ int mysql_create_db(THD *thd, char *db, HA_CREATE_INFO *create_info,
   }
   else
   {
+    if (my_errno != ENOENT)
+    {
+      my_error(EE_STAT, MYF(0),path,my_errno);
+      goto exit;
+    }
     strend(path)[-1]=0;				// Remove last '/' from path
     if (my_mkdir(path,0777,MYF(0)) < 0)
     {