Commit 5fa063ba authored by unknown's avatar unknown
Browse files

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
parent 81ceac59

netware/Makefile.am

+2 −0
Original line number Diff line number Diff line
@@ -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

netware/mysql_test_run.c

+2 −8
Original line number Diff line number Diff line
@@ -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;

}

scripts/mysql_install_db.sh

+6 −1
Original line number Diff line number Diff line
@@ -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