diff options
author | pem@mysql.com <> | 2004-05-26 17:04:45 +0200 |
---|---|---|
committer | pem@mysql.com <> | 2004-05-26 17:04:45 +0200 |
commit | 71eddc362e7d22b9922bad9d093819592208726b (patch) | |
tree | e4e5bb1f8b9718ec195b357c050b3dc3254b447d /netware/my_manage.h | |
parent | 350d8a215bb83518519a2c7c1bc218170bb6b8a9 (diff) | |
parent | 94c0611e6b1f7a1ee93facc31a2f2876cf664e7a (diff) | |
download | mariadb-git-71eddc362e7d22b9922bad9d093819592208726b.tar.gz |
Merging 4.1 to 5.0.
Diffstat (limited to 'netware/my_manage.h')
-rw-r--r-- | netware/my_manage.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/netware/my_manage.h b/netware/my_manage.h index 4215ae59a25..480eefbe55a 100644 --- a/netware/my_manage.h +++ b/netware/my_manage.h @@ -97,11 +97,11 @@ void free_args(arg_list_t *); int sleep_until_file_exists(char *); int sleep_until_file_deleted(char *); -int wait_for_server_start(char *, char *, char *, int); +int wait_for_server_start(char *, char *, char *, int,char *); int spawn(char *, arg_list_t *, int, char *, char *, char *); -int stop_server(char *, char *, char *, int, char *); +int stop_server(char *, char *, char *, int, char *,char *); pid_t get_server_pid(char *); void kill_server(pid_t pid); |