diff options
| author | unknown <monty@mysql.com> | 2004-06-18 04:22:43 +0300 |
|---|---|---|
| committer | unknown <monty@mysql.com> | 2004-06-18 04:22:43 +0300 |
| commit | 5fa063ba7eda4bbe70e758b2e5662dbd4edfe961 (patch) | |
| tree | 20d312dc3d4ab02003d96769dc0eaa40517af707 /netware | |
| parent | 81ceac59f86534882a5db48ce2dd24de66fd410e (diff) | |
| download | mariadb-git-5fa063ba7eda4bbe70e758b2e5662dbd4edfe961.tar.gz | |
ke it possible to use mysys functions in netware/mysql_test_run.c
Don't pass --user to mysqld if --user is not used
netware/Makefile.am:
Make it possible to use mysys functions in mysql_test_run.c
netware/mysql_test_run.c:
Make it possible to use mysys functions in mysql_test_run.c
scripts/mysql_install_db.sh:
Don't pass --user to mysqld if --user is not used
Diffstat (limited to 'netware')
| -rw-r--r-- | netware/Makefile.am | 2 | ||||
| -rw-r--r-- | netware/mysql_test_run.c | 10 |
2 files changed, 4 insertions, 8 deletions
diff --git a/netware/Makefile.am b/netware/Makefile.am index 7d7d0a096e1..017188b7e23 100644 --- a/netware/Makefile.am +++ b/netware/Makefile.am @@ -16,6 +16,8 @@ if HAVE_NETWARE INCLUDES = -I$(srcdir)/../include -I../include -I.. +LDADD = @CLIENT_EXTRA_LDFLAGS@ ../mysys/libmysys.a \ + ../dbug/libdbug.a ../strings/libmystrings.a bin_PROGRAMS = mysqld_safe mysql_install_db mysql_test_run libmysql mysqld_safe_SOURCES= mysqld_safe.c my_manage.c mysql_install_db_SOURCES= mysql_install_db.c my_manage.c diff --git a/netware/mysql_test_run.c b/netware/mysql_test_run.c index 06d5e5985c1..5e5f49da73f 100644 --- a/netware/mysql_test_run.c +++ b/netware/mysql_test_run.c @@ -16,20 +16,15 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ -#include <stdlib.h> -#include <stdio.h> -#include <errno.h> +#include <my_global.h> +#include <m_string.h> #include <dirent.h> -#include <string.h> #include <screen.h> #include <nks/vm.h> #include <ctype.h> #include <sys/stat.h> -#include <unistd.h> -#include <fcntl.h> #include <sys/mode.h> -#include "my_config.h" #include "my_manage.h" /****************************************************************************** @@ -1271,4 +1266,3 @@ int main(int argc, char **argv) return 0; } - |