summaryrefslogtreecommitdiff
path: root/win
diff options
context:
space:
mode:
authorunknown <tsmith@siva.hindu.god>2007-01-09 19:22:01 -0700
committerunknown <tsmith@siva.hindu.god>2007-01-09 19:22:01 -0700
commitc2e9a4af2dcebee419398a17530ef5c28d7962a9 (patch)
tree66654967ac4cd7bca3c3211426681a8f9ce3879d /win
parenta1ecbab689ed475ce61c05c7b02609b1efe5e660 (diff)
downloadmariadb-git-c2e9a4af2dcebee419398a17530ef5c28d7962a9.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 configure.in: WL#3670 Add --disable-grant-options mysql-test/install_test_db.sh: Add MYSQLD_BOOTSTRAP env variable, to enable test suite to work even if mysqld does not accept --bootstrap or --skip-grant-tables. mysql-test/mysql-test-run.pl: Add MYSQLD_BOOTSTRAP env variable, to enable test suite to work even if mysqld does not accept --bootstrap or --skip-grant-tables. mysql-test/mysql_test_run_new.c: Mention need for MYSQLD_BOOTSTRAP in a comment, in case this needs to be used with a mysqld which does not accept the --bootstrap option. scripts/mysql_install_db.sh: Add MYSQLD_BOOTSTRAP env variable, to enable mysqld_install_db to work even if mysqld does not accept --bootstrap or --skip-grant-tables. sql/CMakeLists.txt: Add DISABLE_GRANT_OPTIONS define sql/mysqld.cc: Add DISABLE_GRANT_OPTIONS define, which removes the --bootstrap, --init-file, and --skip-grant-tables options win/README: Document the DISABLE_GRANT_OPTIONS define win/configure.js: Handle DISABLE_GRANT_OPTIONS
Diffstat (limited to 'win')
-rw-r--r--win/README3
-rwxr-xr-xwin/configure.js1
2 files changed, 4 insertions, 0 deletions
diff --git a/win/README b/win/README
index cbda33e1184..8fe3dc21d1e 100644
--- a/win/README
+++ b/win/README
@@ -49,6 +49,9 @@ The options right now are
COMPILATION_COMMENT=<comment> Server comment, default "Source distribution"
MYSQL_TCP_PORT=<port> Server port, default 3306
CYBOZU
+ DISABLE_GRANT_OPTIONS Disables the use of --init-file and --skip-grant-tables
+ options of mysqld.exe
+
So the command line could look like:
diff --git a/win/configure.js b/win/configure.js
index ef90ce982a6..a7c706ce27c 100755
--- a/win/configure.js
+++ b/win/configure.js
@@ -32,6 +32,7 @@ try
case "WITH_PARTITION_STORAGE_ENGINE":
case "__NT__":
case "CYBOZU":
+ case "DISABLE_GRANT_OPTIONS":
configfile.WriteLine("SET (" + args.Item(i) + " TRUE)");
break;
case "MYSQL_SERVER_SUFFIX":