From f56df164f0603b268806108526d59e5d02fef82b Mon Sep 17 00:00:00 2001
From: "monty@mysql.com" <>
Date: Fri, 18 Jun 2004 04:22:43 +0300
Subject: ke it possible to use mysys functions in netware/mysql_test_run.c
 Don't pass --user to mysqld if --user is not used

---
 scripts/mysql_install_db.sh | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

(limited to 'scripts')

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
-- 
cgit v1.2.1