diff options
| author | unknown <monty@mysql.com> | 2004-05-25 22:54:00 +0300 |
|---|---|---|
| committer | unknown <monty@mysql.com> | 2004-05-25 22:54:00 +0300 |
| commit | a9b481d3cd7fbf832b17523c521185db6366492c (patch) | |
| tree | b258dbd41e0b45f70adf8c42ee94cce74cd0232f /netware/my_manage.c | |
| parent | de5edbf8db66e1f896b76d408152cd0094dcf684 (diff) | |
| parent | a3d0ce6bc611673e2d5342bc9cd735a9febfe6b4 (diff) | |
| download | mariadb-git-a9b481d3cd7fbf832b17523c521185db6366492c.tar.gz | |
merge with 4.0 to get Netware patches and fixes for libmysqld.dll
configure.in:
Auto merged
Build-tools/Do-compile:
Auto merged
client/mysql.cc:
Auto merged
client/mysqladmin.c:
Auto merged
client/mysqlcheck.c:
Auto merged
client/mysqldump.c:
Auto merged
client/mysqlimport.c:
Auto merged
client/mysqlshow.c:
Auto merged
client/mysqltest.c:
Auto merged
include/my_global.h:
Auto merged
include/thr_alarm.h:
Auto merged
innobase/include/trx0roll.h:
Auto merged
innobase/include/trx0trx.h:
Auto merged
innobase/que/que0que.c:
Auto merged
innobase/srv/srv0srv.c:
Auto merged
innobase/trx/trx0purge.c:
Auto merged
innobase/trx/trx0roll.c:
Auto merged
innobase/trx/trx0trx.c:
Auto merged
innobase/usr/usr0sess.c:
Auto merged
isam/isamchk.c:
Auto merged
myisam/myisam_ftdump.c:
Auto merged
myisam/myisamchk.c:
Auto merged
myisam/myisampack.c:
Auto merged
mysys/default.c:
Auto merged
mysys/my_getopt.c:
Auto merged
mysys/my_init.c:
Auto merged
mysys/my_pthread.c:
Auto merged
netware/Makefile.am:
Auto merged
netware/init_db.sql:
Auto merged
scripts/make_binary_distribution.sh:
Auto merged
tools/mysqlmanager.c:
Auto merged
VC++Files/dbug/dbug.dsp:
Auto merged
VC++Files/heap/heap.dsp:
Auto merged
VC++Files/isam/isam.dsp:
Auto merged
VC++Files/libmysql/libmysql.dsp:
Auto merged
VC++Files/myisam/myisam.dsp:
Auto merged
VC++Files/myisammrg/myisammrg.dsp:
Auto merged
VC++Files/mysys/mysys.dsp:
Auto merged
VC++Files/libmysqld/libmysqld.dsp:
merge
client/mysqlbinlog.cc:
merge
extra/perror.c:
merge
include/mysql_com.h:
merge
libmysqld/Makefile.am:
merge
netware/BUILD/mwenv:
merge
sql/mysqld.cc:
merge
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); |