diff options
| author | unknown <mmj@tiger.mmj.dk> | 2007-01-11 09:19:32 +0100 |
|---|---|---|
| committer | unknown <mmj@tiger.mmj.dk> | 2007-01-11 09:19:32 +0100 |
| commit | 50361d9a44ddce3d0253feba9c658a17b2b0a517 (patch) | |
| tree | 255d4cdb83d5c64b996d7d22b14af8b5f4ee8b06 /win | |
| parent | c11c3b08b8354836a5b1073b122f68ef0dc117f6 (diff) | |
| parent | a4817aced500feede54a9548b650650e513b69d9 (diff) | |
| download | mariadb-git-50361d9a44ddce3d0253feba9c658a17b2b0a517.tar.gz | |
Merge mjorgensen@bk-internal.mysql.com:/home/bk/mysql-5.0-sage
into tiger.mmj.dk:/Users/mmj/bktrees/mysql-5.0
configure.in:
Auto merged
mysql-test/install_test_db.sh:
Auto merged
mysql-test/mysql-test-run.pl:
Auto merged
scripts/mysql_install_db.sh:
Auto merged
sql/CMakeLists.txt:
Auto merged
sql/mysqld.cc:
Auto merged
win/configure.js:
Auto merged
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 83531815abd..59c73fc2fab 100755 --- a/win/configure.js +++ b/win/configure.js @@ -47,6 +47,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": |