1berry/MariaDB-server
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge mysql.com:/home/alik/MySQL/devel/5.0-tree

Browse Source 
into  mysql.com:/home/alik/MySQL/devel/5.0-rt
This commit is contained in:
anozdrin@mysql.com 2006-06-26 21:58:55 +04:00
commit 8f4582db27
2 changed files with 10 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
mysys/mf_dirname.c
View File

@ -72,7 +72,9 @@ uint dirname_part(my_string to, const char *name)
SYNPOSIS SYNPOSIS
convert_dirname() convert_dirname()
to Store result here to Store result here. Must be at least of size
min(FN_REFLEN, strlen(from) + 1) to make room
for adding FN_LIBCHAR at the end.
from Original filename from Original filename
from_end Pointer at end of filename (normally end \0) from_end Pointer at end of filename (normally end \0)

7
server-tools/instance-manager/instance_options.cc
View File

@ -391,8 +391,13 @@ int Instance_options::complete_initialization(const char *default_path,
const char *tmp; const char *tmp;
char *end; char *end;
if (!mysqld_path && !(mysqld_path= strdup_root(&alloc, default_path))) if (!mysqld_path)
{
// Need one extra byte, as convert_dirname() adds a slash at the end.
if (!(mysqld_path= alloc_root(&alloc, strlen(default_path) + 2)))
goto err; goto err;
strcpy((char *)mysqld_path, default_path);
}
// it's safe to cast this to char* since this is a buffer we are allocating // it's safe to cast this to char* since this is a buffer we are allocating
end= convert_dirname((char*)mysqld_path, mysqld_path, NullS); end= convert_dirname((char*)mysqld_path, mysqld_path, NullS);