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 /scripts | |
| 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 'scripts')
| -rw-r--r-- | scripts/mysql_install_db.sh | 7 |
1 files changed, 6 insertions, 1 deletions
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 |