mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-01-17 20:42:30 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

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

Browse source 
into  mysql.com:/usr/local/mysql/mysql-5.1-vg-apr2
This commit is contained in:
knielsen@mysql.com 2006-06-23 14:59:40 +02:00
commit af9e69b512
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
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_end Pointer at end of filename (normally end \0)

9
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;
char *end;
if (!mysqld_path.str && !(mysqld_path.str= strdup_root(&alloc, default_path)))
goto err;
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;
strcpy(mysqld_path.str, default_path);
}
// 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);