summaryrefslogtreecommitdiff
path: root/win
diff options
context:
space:
mode:
authormmj@tiger.mmj.dk <>2007-01-11 09:19:32 +0100
committermmj@tiger.mmj.dk <>2007-01-11 09:19:32 +0100
commit49913f2a95d8dcb3ff05160f4c5bf22222bb5f26 (patch)
tree255d4cdb83d5c64b996d7d22b14af8b5f4ee8b06 /win
parent27d56afcfc5c7ccb7793d15f5643fcc058ceaa51 (diff)
parentba7b6e86f269ed5a634af13f422b92be3294431c (diff)
downloadmariadb-git-49913f2a95d8dcb3ff05160f4c5bf22222bb5f26.tar.gz
Merge mjorgensen@bk-internal.mysql.com:/home/bk/mysql-5.0-sage
into tiger.mmj.dk:/Users/mmj/bktrees/mysql-5.0
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 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":