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 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
parent 860c104d87 0f3cc95bf1
commit 46d19b7409
2 changed files with 10 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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);