database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-07-29 05:21:33 +03:00
Code Activity

Merge 10.1 into 10.2

Browse Source
This commit is contained in:
Marko Mäkelä
2020-07-02 06:05:13 +03:00
parent 838a1046b2 c43a666662
commit dba7e1e8e1
4 changed files with 43 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
sql/mysql_install_db.cc
View File

@ -406,8 +406,8 @@ static int register_service()
static void clean_directory(const char *dir)
{
char dir2[MAX_PATH+2];
*(strmake_buf(dir2, dir)+1)= 0;
char dir2[MAX_PATH + 4]= {};
snprintf(dir2, MAX_PATH+2, "%s\\*", dir);
SHFILEOPSTRUCT fileop;
fileop.hwnd= NULL; /* no status display */
@ -558,7 +558,7 @@ static int create_db_instance()
DWORD cwd_len= MAX_PATH;
char cmdline[3*MAX_PATH];
FILE *in;
bool cleanup_datadir= true;
bool created_datadir= false;
DWORD last_error;
verbose("Running bootstrap");
@ -567,7 +567,11 @@ static int create_db_instance()
/* Create datadir and datadir/mysql, if they do not already exist. */
if (!CreateDirectory(opt_datadir, NULL) && (GetLastError() != ERROR_ALREADY_EXISTS))
if (CreateDirectory(opt_datadir, NULL))
{
created_datadir= true;
}
else if (GetLastError() != ERROR_ALREADY_EXISTS)
{
last_error = GetLastError();
switch(last_error)
@ -604,9 +608,11 @@ static int create_db_instance()
}
}
if (PathIsDirectoryEmpty(opt_datadir))
if (!PathIsDirectoryEmpty(opt_datadir))
{
cleanup_datadir= false;
fprintf(stderr,"ERROR : Data directory %s is not empty."
" Only new or empty existing directories are accepted for --datadir\n",opt_datadir);
exit(1);
}
if (!CreateDirectory("mysql",NULL))
@ -735,10 +741,12 @@ static int create_db_instance()
}
end:
if (ret && cleanup_datadir)
if (ret)
{
SetCurrentDirectory(cwd);
clean_directory(opt_datadir);
if (created_datadir)
RemoveDirectory(opt_datadir);
}
return ret;
}