merge

4 files changed, 12 insertions, 12 deletions

diff --git a/win/README b/win/README
index 916f64913ac..8ae611ec746 100644
--- a/win/README
+++ b/win/README
@@ -51,12 +51,10 @@ win\configure <options>
 
 The options right now are:
 
-    WITH_INNOBASE_STORAGE_ENGINE         Enable particular storage engines
-    WITH_PARTITION_STORAGE_ENGINE
-    WITH_ARCHIVE_STORAGE_ENGINE
-    WITH_BLACKHOLE_STORAGE_ENGINE
-    WITH_EXAMPLE_STORAGE_ENGINE
-    WITH_FEDERATED_STORAGE_ENGINE
+    --with-plugin-XXX                    Enable particular plugin or plugins
+    --with-plugins=XXX,YYY,...
+    --with-plugins=GROUP                 GROUP can be, for example, "max" or "max-no-ndb"
+    --without-plugin-XXX                 Disable particular plugin
     __NT__                               Enable named pipe support
     MYSQL_SERVER_SUFFIX=<suffix>         Server suffix, default none
     COMPILATION_COMMENT=<comment>        Server comment, default "Source distribution"
@@ -70,7 +68,7 @@ The options right now are:
                                 
 So the command line could look like:
 
-win\configure WITH_INNOBASE_STORAGE_ENGINE WITH_PARTITION_STORAGE_ENGINE MYSQL_SERVER_SUFFIX=-pro
+win\configure --with-plugin-innobase --with-plugin-partition MYSQL_SERVER_SUFFIX=-pro
 
 Step 6
 ------
diff --git a/win/configure-mariadb.bat b/win/configure-mariadb.bat
index 6c4283359b4..dc5b59819a3 100644
--- a/win/configure-mariadb.bat
+++ b/win/configure-mariadb.bat
@@ -5,4 +5,5 @@ cscript win\configure.js ^
  WITH_PARTITION_STORAGE_ENGINE ^
  WITH_ARIA_STORAGE_ENGINE ^
  WITH_PBXT_STORAGE_ENGINE ^
- WITH_XTRADB_STORAGE_ENGINE
+ WITH_XTRADB_STORAGE_ENGINE ^
+ WITH_FEEDBACK_STORAGE_ENGINE
diff --git a/win/configure-mariadb.sh b/win/configure-mariadb.sh
index 616d1b790d6..67bfe293639 100644
--- a/win/configure-mariadb.sh
+++ b/win/configure-mariadb.sh
@@ -18,4 +18,5 @@ cscript win/configure.js \
  WITH_ARIA_STORAGE_ENGINE \
  WITH_PBXT_STORAGE_ENGINE \
  WITH_XTRADB_STORAGE_ENGINE \
+ WITH_FEEDBACK_STORAGE_ENGINE \
  WITH_EMBEDDED_SERVER
diff --git a/win/configure.js b/win/configure.js
index da7e4c2cd43..43234b39c22 100644
--- a/win/configure.js
+++ b/win/configure.js
@@ -126,7 +126,7 @@ try
     var engineOptions = ParsePlugins();
     for (option in engineOptions)
     {
-       configfile.WriteLine("SET(" + engineOptions[option] + " TRUE)");
+       configfile.WriteLine("SET (" + engineOptions[option] + " TRUE)");
     }
     configfile.Close();
     
@@ -302,7 +302,7 @@ function ParsePlugins()
         {
             var content = fso.OpenTextFile(filename, ForReading).ReadAll();
             var match = 
-              /MYSQL_STORAGE_ENGINE([ ]*)[\(]([^\)]+)[\)]/.exec(content);
+              /MYSQL_(PLUGIN|STORAGE_ENGINE)([ ]*)[\(]([^\)]+)[\)]/.exec(content);
             if (match== null)
                 continue;
             match = /\[[\w,\-_]+\][\s]?\)/.exec(match[0]);
@@ -329,9 +329,9 @@ function ParsePlugins()
     for(key in config)
     {
         var eng = config[key];
-        if(eng.isGroup != undefined && !eng.isGroup	&& eng.include != undefined)
+        if(eng.isGroup != undefined && !eng.isGroup && eng.include != undefined)
         {
-            if (fso.FolderExists("storage\\"+key) || key=="PARTITION")
+            if (fso.FolderExists("storage\\"+key) || fso.FolderExists("plugin\\"+key) || key=="PARTITION")
             {
                 arr[arr.length] = eng.include? 
                     "WITH_"+key+"_STORAGE_ENGINE":"WITHOUT_"+key+"_STORAGE_ENGINE";