database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-12-24 11:21:21 +03:00
Code Activity

Merge ua141d10.elisa.omakaista.fi:/home/my/bk/mysql-4.1

Browse Source 
into  ua141d10.elisa.omakaista.fi:/home/my/bk/mysql-5.0
This commit is contained in:
jani@ua141d10.elisa.omakaista.fi
2006-01-12 20:28:23 +02:00
parent fac966560a 8c6a32b997
commit 617585eb33
7 changed files with 52 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
netware/mysqld_safe.c
View File

@@ -258,11 +258,11 @@ void finish_defaults()
void read_defaults(arg_list_t *pal)
{
arg_list_t al;
char defaults_file[PATH_MAX];
char defaults_file[PATH_MAX];
char mydefaults[PATH_MAX];
char line[PATH_MAX];
FILE *fp;
// defaults output file
snprintf(defaults_file, PATH_MAX, "%s/bin/defaults.out", basedir);
remove(defaults_file);
@@ -270,7 +270,7 @@ void read_defaults(arg_list_t *pal)
// mysqladmin file
snprintf(mydefaults, PATH_MAX, "%s/bin/my_print_defaults", basedir);
// args
// args
init_args(&al);
add_arg(&al, mydefaults);
if (default_option[0])
@@ -279,11 +279,11 @@ void read_defaults(arg_list_t *pal)
add_arg(&al, "server");
add_arg(&al, "mysqld_safe");
add_arg(&al, "safe_mysqld");
spawn(mydefaults, &al, TRUE, NULL, defaults_file, NULL);
free_args(&al);
// gather defaults
if ((fp= fopen(defaults_file, "r")) != NULL)
{