diff options
| author | unknown <greg@gcw.ath.cx> | 2003-07-23 01:35:24 -0400 |
|---|---|---|
| committer | unknown <greg@gcw.ath.cx> | 2003-07-23 01:35:24 -0400 |
| commit | 970f1abbdb9a67936b66fc96a0c6fa1f0aa1535c (patch) | |
| tree | f0605a3830336273f73d85077b78b068ef98833f /netware/my_manage.h | |
| parent | c64dda59434c026071c09515a68d3c70c15dd648 (diff) | |
| download | mariadb-git-970f1abbdb9a67936b66fc96a0c6fa1f0aa1535c.tar.gz | |
mysql_test_run.c and associated files, with my initial changes and WAX's changes for Windows
netware/Makefile.am:
Replace tabs
netware/my_manage.c:
Various changes toward platform independence
netware/my_manage.h:
Various changes toward platform independence
netware/mysql_test_run.c:
Various changes toward platform independence
BitKeeper/etc/logging_ok:
Logging to logging@openlogging.org accepted
Diffstat (limited to 'netware/my_manage.h')
| -rw-r--r-- | netware/my_manage.h | 34 |
1 files changed, 32 insertions, 2 deletions
diff --git a/netware/my_manage.h b/netware/my_manage.h index b19662c4ee9..4215ae59a25 100644 --- a/netware/my_manage.h +++ b/netware/my_manage.h @@ -26,17 +26,41 @@ ******************************************************************************/ #include <stdlib.h> +#ifndef __WIN__ #include <unistd.h> +#endif /****************************************************************************** macros ******************************************************************************/ +#ifdef __WIN__ +#define PATH_MAX _MAX_PATH +#define NAME_MAX _MAX_FNAME +#define kill(A,B) TerminateProcess((HANDLE)A,0) +#define NOT_NEED_PID 0 +#define MASTER_PID 1 +#define SLAVE_PID 2 +#define mysqld_timeout 60000 + +intptr_t master_server; +intptr_t slave_server; +int pid_mode; +bool run_server; +char win_args[1024]; +bool skip_first_param; +#endif + #define ARG_BUF 10 #define TRY_MAX 5 +#ifdef __NETWARE__ +#define strstr(A,B) strindex(A,B) +#endif + + /****************************************************************************** structures @@ -53,6 +77,8 @@ typedef struct } arg_list_t; + +typedef int pid_t; /****************************************************************************** global variables @@ -66,7 +92,7 @@ typedef struct ******************************************************************************/ void init_args(arg_list_t *); -void add_arg(arg_list_t *, char *, ...); +void add_arg(arg_list_t *, const char *, ...); void free_args(arg_list_t *); int sleep_until_file_exists(char *); @@ -80,8 +106,12 @@ pid_t get_server_pid(char *); void kill_server(pid_t pid); void del_tree(char *); -int removef(char *, ...); +int removef(const char *, ...); void get_basedir(char *, char *); +char mysqladmin_file[PATH_MAX]; + #endif /* _MY_MANAGE */ + + |