diff options
| author | unknown <jani@ua141d10.elisa.omakaista.fi> | 2006-01-12 20:28:23 +0200 |
|---|---|---|
| committer | unknown <jani@ua141d10.elisa.omakaista.fi> | 2006-01-12 20:28:23 +0200 |
| commit | a48380cd9a29a67cb161ffc0a9b7a037efe04297 (patch) | |
| tree | 986db555a436ebf570733597877d21e2ffa95d36 /netware | |
| parent | 26252fa28bfa0c2dcf7d7b47cba51f47b30b2eb7 (diff) | |
| parent | 1665d2370716a44acf7d35339019ad5b9e134b99 (diff) | |
| download | mariadb-git-a48380cd9a29a67cb161ffc0a9b7a037efe04297.tar.gz | |
Merge ua141d10.elisa.omakaista.fi:/home/my/bk/mysql-4.1
into ua141d10.elisa.omakaista.fi:/home/my/bk/mysql-5.0
client/mysqlimport.c:
Auto merged
include/config-netware.h:
Auto merged
innobase/os/os0thread.c:
Auto merged
netware/mysqld_safe.c:
Auto merged
sql/item_cmpfunc.cc:
Auto merged
sql/mysqld.cc:
Merged from 4.1.
sql/sql_base.cc:
Merged from 4.1.
sql/sql_handler.cc:
Merged from 4.1.
sql/sql_select.cc:
Merged from 4.1.
Diffstat (limited to 'netware')
| -rw-r--r-- | netware/mysqld_safe.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/netware/mysqld_safe.c b/netware/mysqld_safe.c index 3a1672fdf61..9db8a441ca3 100644 --- a/netware/mysqld_safe.c +++ b/netware/mysqld_safe.c @@ -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) { |