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

manual merge

Browse Source 
charged sql/sql_db.cc only
(
changed length in mysql_create_db to path_len
so as it was calculated in the first unpack_dirname
in my previous fix for Bug #4378
'"create database IF NOT EXISTS thing" returns an error'
)
This commit is contained in:
vva@eagle.mysql.r18.ru
2004-07-09 21:06:32 +05:00
parent 07808113d6 6782982254
commit 34857ee664
1 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
sql/sql_db.cc
View File

@@ -378,9 +378,9 @@ int mysql_create_db(THD *thd, char *db, HA_CREATE_INFO *create_info,
char path[FN_REFLEN+16]; char path[FN_REFLEN+16];
long result= 1; long result= 1;
int error= 0; int error= 0;
uint length;
MY_STAT stat_info; MY_STAT stat_info;
uint create_options= create_info ? create_info->options : 0; uint create_options= create_info ? create_info->options : 0;
uint path_len;
DBUG_ENTER("mysql_create_db"); DBUG_ENTER("mysql_create_db");
VOID(pthread_mutex_lock(&LOCK_mysql_create_db)); VOID(pthread_mutex_lock(&LOCK_mysql_create_db));
@@ -394,7 +394,8 @@ int mysql_create_db(THD *thd, char *db, HA_CREATE_INFO *create_info,
/* Check directory */ /* Check directory */
strxmov(path, mysql_data_home, "/", db, NullS); strxmov(path, mysql_data_home, "/", db, NullS);
unpack_dirname(path,path); // Convert if not unix path_len= unpack_dirname(path,path); // Convert if not unix
path[path_len-1]= 0; // Remove last '/' from path
if (my_stat(path,&stat_info,MYF(0))) if (my_stat(path,&stat_info,MYF(0)))
{ {
@@ -413,7 +414,6 @@ int mysql_create_db(THD *thd, char *db, HA_CREATE_INFO *create_info,
my_error(EE_STAT, MYF(0),path,my_errno); my_error(EE_STAT, MYF(0),path,my_errno);
goto exit; goto exit;
} }
strend(path)[-1]=0; // Remove last '/' from path
if (my_mkdir(path,0777,MYF(0)) < 0) if (my_mkdir(path,0777,MYF(0)) < 0)
{ {
my_error(ER_CANT_CREATE_DB,MYF(0),db,my_errno); my_error(ER_CANT_CREATE_DB,MYF(0),db,my_errno);
@@ -422,15 +422,15 @@ int mysql_create_db(THD *thd, char *db, HA_CREATE_INFO *create_info,
} }
} }
length= unpack_dirname(path, path); path[path_len-1]= FN_LIBCHAR;
strmov(path+ length, MY_DB_OPT_FILE); strmake(path+path_len, MY_DB_OPT_FILE, sizeof(path)-path_len-1);
if (write_db_opt(thd, path, create_info)) if (write_db_opt(thd, path, create_info))
{ {
/* /*
Could not create options file. Could not create options file.
Restore things to beginning. Restore things to beginning.
*/ */
path[length]= 0; path[path_len]= 0;
if (rmdir(path) >= 0) if (rmdir(path) >= 0)
{ {
error= -1; error= -1;