mirror of
https://github.com/MariaDB/server.git
synced 2025-07-29 05:21:33 +03:00
WL #3670: Compile-time option to remove GRANT-related startup options
- configure --disable-grant-options defines DISABLE_GRANT_OPTIONS - configure.js/cmake also updated - if DISABLE_GRANT_OPTIONS is defined, mysqld no longer recognizes: --bootstrap --init-file --skip-grant-tables Scripts which rely on those three options are modified to check the environment for MYSQLD_BOOTSTRAP; it should be set to the full path of a mysqld which does handle those options. For example: $ export MYSQLD_BOOTSTRAP $ MYSQLD_BOOTSTRAP=/path/to/full/MySQL/bin/mysqld $ mysql_install_db $ make test
This commit is contained in:
@ -55,14 +55,17 @@ fi
|
||||
mdata=$data/mysql
|
||||
EXTRA_ARG=""
|
||||
|
||||
if test ! -x $execdir/mysqld
|
||||
mysqld=
|
||||
if test -x $execdir/mysqld
|
||||
then
|
||||
mysqld=$execdir/mysqld
|
||||
else
|
||||
if test ! -x $libexecdir/mysqld
|
||||
then
|
||||
echo "mysqld is missing - looked in $execdir and in $libexecdir"
|
||||
exit 1
|
||||
else
|
||||
execdir=$libexecdir
|
||||
mysqld=$libexecdir/mysqld
|
||||
fi
|
||||
fi
|
||||
|
||||
@ -88,8 +91,11 @@ basedir=.
|
||||
EXTRA_ARG="--language=../sql/share/english/ --character-sets-dir=../sql/share/charsets/"
|
||||
fi
|
||||
|
||||
mysqld_boot=" $execdir/mysqld --no-defaults --bootstrap --skip-grant-tables \
|
||||
--basedir=$basedir --datadir=$ldata --skip-innodb --skip-ndbcluster --skip-bdb \
|
||||
mysqld_boot="${MYSQLD_BOOTSTRAP-$mysqld}"
|
||||
|
||||
mysqld_boot="$mysqld_boot --no-defaults --bootstrap --skip-grant-tables \
|
||||
--basedir=$basedir --datadir=$ldata \
|
||||
--skip-innodb --skip-ndbcluster --skip-bdb \
|
||||
$EXTRA_ARG"
|
||||
echo "running $mysqld_boot"
|
||||
|
||||
|
Reference in New Issue
Block a user