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 /win | |
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 'win')
-rw-r--r-- | win/README | 3 | ||||
-rwxr-xr-x | win/configure.js | 1 |
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": |