mirror of
https://github.com/MariaDB/server.git
synced 2025-09-08 06:27:57 +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:
@@ -292,6 +292,14 @@ void install_db(char *datadir)
|
||||
die("Unable to create init_db.sql.");
|
||||
/* args */
|
||||
init_args(&al);
|
||||
/*
|
||||
XXX: If mysqld is compiled with DISABLE_GRANT_OPTIONS defined, it
|
||||
will not recognize the --bootstrap, --init-file or --skip-grant-
|
||||
tables options. If this is needed here, please check
|
||||
MYSQLD_BOOTSTRAP in the environment, and use its value instead of
|
||||
mysqld_file if it is set. See mysql-test-run.pl and
|
||||
mysql_install_db.
|
||||
*/
|
||||
add_arg(&al, mysqld_file);
|
||||
add_arg(&al, "--no-defaults");
|
||||
add_arg(&al, "--bootstrap");
|
||||
|
Reference in New Issue
Block a user