diff options
| author | monty@mysql.com <> | 2004-05-25 22:00:14 +0300 |
|---|---|---|
| committer | monty@mysql.com <> | 2004-05-25 22:00:14 +0300 |
| commit | f2e1e3ce4c72d383f16fd8c525b28c4912e8f2de (patch) | |
| tree | 2c56473da947b9807f0d1668171870a8e3dbc736 /netware/my_manage.c | |
| parent | d14e4eb57c92b987152b255ec961b1e9103d8f66 (diff) | |
| download | mariadb-git-f2e1e3ce4c72d383f16fd8c525b28c4912e8f2de.tar.gz | |
Added patches from Novell
Diffstat (limited to 'netware/my_manage.c')
| -rw-r--r-- | netware/my_manage.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/netware/my_manage.c b/netware/my_manage.c index 1c1e75990b4..f5aa3163431 100644 --- a/netware/my_manage.c +++ b/netware/my_manage.c @@ -180,7 +180,7 @@ int sleep_until_file_exists(char *pid_file) Wait for the server on the given port to start. ******************************************************************************/ -int wait_for_server_start(char *bin_dir, char *user, char *password, int port) +int wait_for_server_start(char *bin_dir, char *user, char *password, int port,char *tmp_dir) { arg_list_t al; int err, i; @@ -189,7 +189,7 @@ int wait_for_server_start(char *bin_dir, char *user, char *password, int port) // mysqladmin file snprintf(mysqladmin_file, PATH_MAX, "%s/mysqladmin", bin_dir); - snprintf(trash, PATH_MAX, "/tmp/trash.out"); + snprintf(trash, PATH_MAX, "%s/trash.out",tmp_dir); // args init_args(&al); @@ -283,7 +283,7 @@ int spawn(char *path, arg_list_t *al, int join, char *input, ******************************************************************************/ int stop_server(char *bin_dir, char *user, char *password, int port, - char *pid_file) + char *pid_file,char *tmp_dir) { arg_list_t al; int err, i, argc = 0; @@ -292,7 +292,7 @@ int stop_server(char *bin_dir, char *user, char *password, int port, // mysqladmin file snprintf(mysqladmin_file, PATH_MAX, "%s/mysqladmin", bin_dir); - snprintf(trash, PATH_MAX, "/tmp/trash.out"); + snprintf(trash, PATH_MAX, "%s/trash.out",tmp_dir); // args init_args(&al); |