diff options
Diffstat (limited to 'netware')
| -rwxr-xr-x | netware/BUILD/compile-linux-tools | 2 | ||||
| -rwxr-xr-x | netware/BUILD/compile-netware-START | 2 | ||||
| -rwxr-xr-x | netware/BUILD/nwbootstrap | 4 | ||||
| -rw-r--r-- | netware/Makefile.am | 6 | ||||
| -rw-r--r-- | netware/my_manage.c | 4 | ||||
| -rw-r--r-- | netware/my_manage.h | 34 |
6 files changed, 40 insertions, 12 deletions
diff --git a/netware/BUILD/compile-linux-tools b/netware/BUILD/compile-linux-tools index 70f07be649e..c21857146e0 100755 --- a/netware/BUILD/compile-linux-tools +++ b/netware/BUILD/compile-linux-tools @@ -36,8 +36,6 @@ make clean all-local (cd heap; make libheap.a) (cd vio; make libvio.a) (cd regex; make libregex.a) -(cd isam; make libnisam.a) -(cd merge; make libmerge.a) (cd myisam; make libmyisam.a) (cd myisammrg; make libmyisammrg.a) (cd extra; make comp_err) diff --git a/netware/BUILD/compile-netware-START b/netware/BUILD/compile-netware-START index 7eef192a907..9918ead87c5 100755 --- a/netware/BUILD/compile-netware-START +++ b/netware/BUILD/compile-netware-START @@ -22,5 +22,7 @@ base_configs=" \ --enable-local-infile \ --with-extra-charsets=all \ --prefix=N:/mysql \ + --without-mysqlmanager \ + --without-man \ " diff --git a/netware/BUILD/nwbootstrap b/netware/BUILD/nwbootstrap index 2bd7150ec0d..48ff2a49667 100755 --- a/netware/BUILD/nwbootstrap +++ b/netware/BUILD/nwbootstrap @@ -171,10 +171,10 @@ do rm $file.org done -# create the libmysql.imp file in netware folder from libmysql/libmysql.def file +# create the libmysql.imp file in netware folder from libmysql/libmysql.def +# file echo "generating llibmysql.imp file..." awk 'BEGIN{x=0;} END{printf("\n");} x==1 {printf(" %s",$1); x++; next} x>1 {printf(",\n %s", $1);next} /EXPORTS/{x=1}' libmysql/libmysql.def > netware/libmysql.imp - # build linux tools echo "compiling linux tools..." ./netware/BUILD/compile-linux-tools diff --git a/netware/Makefile.am b/netware/Makefile.am index 2467270f27b..92c8afba896 100644 --- a/netware/Makefile.am +++ b/netware/Makefile.am @@ -32,8 +32,6 @@ netware_build_files = client/mysql.def client/mysqladmin.def \ extra/mysql_install.def extra/my_print_defaults.def \ extra/perror.def extra/replace.def \ extra/resolveip.def extra/comp_err.def \ - isam/isamchk.def \ - isam/isamlog.def isam/pack_isam.def \ libmysqld/libmysqld.def myisam/myisamchk.def \ myisam/myisamlog.def myisam/myisampack.def \ sql/mysqld.def extra/mysql_waitpid.def \ @@ -48,7 +46,7 @@ link_sources: done; else EXTRA_DIST= comp_err.def init_db.sql install_test_db.ncf \ - isamchk.def isamlog.def libmysql.def libmysql.imp \ + libmysql.def libmysql.imp \ libmysqlmain.c my_manage.c my_manage.h \ my_print_defaults.def myisam_ftdump.def myisamchk.def \ myisamlog.def myisampack.def mysql.def mysql.xdc \ @@ -58,7 +56,7 @@ EXTRA_DIST= comp_err.def init_db.sql install_test_db.ncf \ mysql_test_run.def mysql_waitpid.def mysqladmin.def \ mysqlbinlog.def mysqlcheck.def mysqld.def \ mysqld_safe.c mysqld_safe.def mysqldump.def mysqlimport.def \ - mysqlshow.def mysqltest.def pack_isam.def perror.def \ + mysqlshow.def mysqltest.def perror.def \ replace.def resolve_stack_dump.def resolveip.def test_db.sql \ static_init_db.sql \ BUILD/apply-patch BUILD/compile-AUTOTOOLS \ diff --git a/netware/my_manage.c b/netware/my_manage.c index 29514837837..d5032da2208 100644 --- a/netware/my_manage.c +++ b/netware/my_manage.c @@ -73,7 +73,7 @@ void init_args(arg_list_t *al) Add an argument to a list. ******************************************************************************/ -void add_arg(arg_list_t *al, char *format, ...) +void add_arg(arg_list_t *al, const char *format, ...) { va_list ap; char temp[PATH_MAX]; @@ -439,7 +439,7 @@ void del_tree(char *dir) removef() ******************************************************************************/ -int removef(char *format, ...) +int removef(const char *format, ...) { va_list ap; char path[PATH_MAX]; diff --git a/netware/my_manage.h b/netware/my_manage.h index ada02378ee4..480eefbe55a 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 */ + + |