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

Merge mysql.com:/usr/local/mysql/mysql-5.0-bug20622

Browse Source 
into  mysql.com:/usr/local/mysql/mysql-5.1-vg-apr2


mysys/mf_dirname.c:
  Auto merged
server-tools/instance-manager/instance_options.cc:
  Manual merge.
This commit is contained in:
unknown 2006-06-23 14:59:40 +02:00
commit 46d19b7409
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. May be == to from Original filename. May be == to
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

@ -420,8 +420,13 @@ int Instance_options::complete_initialization(const char *default_path)
const char *tmp; const char *tmp;
char *end; char *end;
if (!mysqld_path.str && !(mysqld_path.str= strdup_root(&alloc, default_path))) if (!mysqld_path.str)
{
// Need one extra byte, as convert_dirname() adds a slash at the end.
if (!(mysqld_path.str= alloc_root(&alloc, strlen(default_path) + 2)))
goto err; goto err;
strcpy(mysqld_path.str, 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.str, mysqld_path.str, NullS); end= convert_dirname((char*)mysqld_path.str, mysqld_path.str, NullS);