database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-08-01 03:47:19 +03:00
Code Activity

Fix for bug #3691 (libmysqld reports error 2 on CREATE DATABASE

Browse Source 
but database is created)
handling of CREATE DATABASE errors changed
This commit is contained in:
hf@deer.(none)
2004-05-24 12:23:52 +05:00
parent cb07a07ed9
commit 098d8dd01f
1 changed files with 7 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
sql/sql_db.cc
View File

@ -18,6 +18,7 @@
/* create and drop of databases */ /* create and drop of databases */
#include "mysql_priv.h" #include "mysql_priv.h"
#include <mysys_err.h>
#include "sql_acl.h" #include "sql_acl.h"
#include <my_dir.h> #include <my_dir.h>
#include <m_ctype.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); strxmov(path, mysql_data_home, "/", db, NullS);
unpack_dirname(path,path); // Convert if not unix 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)) 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 else
{ {
if (my_errno != ENOENT)
{
my_error(EE_STAT, MYF(0),path,my_errno);
goto exit;
}
strend(path)[-1]=0; // Remove last '/' from path strend(path)[-1]=0; // Remove last '/' from path
if (my_mkdir(path,0777,MYF(0)) < 0) if (my_mkdir(path,0777,MYF(0)) < 0)
{ {