From f56df164f0603b268806108526d59e5d02fef82b Mon Sep 17 00:00:00 2001
From: "monty@mysql.com" <>
Date: Fri, 18 Jun 2004 04:22:43 +0300
Subject: [PATCH] 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         |  2 ++
 netware/mysql_test_run.c    | 10 ++--------
 scripts/mysql_install_db.sh |  7 ++++++-
 3 files changed, 10 insertions(+), 9 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;
 }
-
diff --git a/scripts/mysql_install_db.sh b/scripts/mysql_install_db.sh
index 600a87328cb..c6e9f04fa91 100644
--- a/scripts/mysql_install_db.sh
+++ b/scripts/mysql_install_db.sh
@@ -10,6 +10,7 @@
 in_rpm=0
 windows=0
 defaults=""
+user=""
 case "$1" in
     -IN-RPM)
       in_rpm="1"; shift
@@ -334,10 +335,14 @@ then
   c_c="$c_c   comment='Column privileges';"
 fi
 
+if test -n "$user"; then
+  args="$args --user=$user"
+fi
+
 echo "Installing all prepared tables"
 if eval "$mysqld $defaults $mysqld_opt --bootstrap --skip-grant-tables \
          --basedir=$basedir --datadir=$ldata --skip-innodb --skip-bdb \
-         --user=$user $args" << END_OF_DATA
+         $extra_arg $args" << END_OF_DATA
 use mysql;
 $c_d
 $i_d