diff options
| author | tsmith@siva.hindu.god <> | 2007-01-09 19:22:01 -0700 |
|---|---|---|
| committer | tsmith@siva.hindu.god <> | 2007-01-09 19:22:01 -0700 |
| commit | bac65ee90a724278b76b27da12c0728b7427324c (patch) | |
| tree | 66654967ac4cd7bca3c3211426681a8f9ce3879d /scripts | |
| parent | dbf5fe90a63424f70dcf9bf3a9f347e0588c61a5 (diff) | |
| download | mariadb-git-bac65ee90a724278b76b27da12c0728b7427324c.tar.gz | |
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
Diffstat (limited to 'scripts')
| -rw-r--r-- | scripts/mysql_install_db.sh | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/scripts/mysql_install_db.sh b/scripts/mysql_install_db.sh index e43b586054e..53324f59f53 100644 --- a/scripts/mysql_install_db.sh +++ b/scripts/mysql_install_db.sh @@ -224,7 +224,8 @@ if test "$in_rpm" -eq 0 -a "$windows" -eq 0 then echo "Installing all prepared tables" fi -mysqld_install_cmd_line="$mysqld $defaults $mysqld_opt --bootstrap \ +mysqld_bootstrap="${MYSQLD_BOOTSTRAP-$mysqld}" +mysqld_install_cmd_line="$mysqld_bootstrap $defaults $mysqld_opt --bootstrap \ --skip-grant-tables --basedir=$basedir --datadir=$ldata --skip-innodb \ --skip-bdb --skip-ndbcluster $args --max_allowed_packet=8M --net_buffer_length=16K" if $scriptdir/mysql_create_system_tables $create_option $mdata $hostname $windows \ |