bzr commit into mysql-5.5-next-mr-bugfixing branch (holyfoot:2970) Bug#51269

[Alexey Botchkov]

#At file:///home/hf/work/mysql_common/51269/ based on revid:magne.mahre@stripped

 2970 Alexey Botchkov	2010-02-18
      Bug#51269      libmysqld is not built on Windows
              embedded server was disabled by default
      
      per-file comments:
        win/configure.js
      Bug#51269      libmysqld is not built on Windows
              enable the embedded server by default. WITHOUT_EMBEDDED_SERVER option now
              should switch it off.

    modified:
      win/configure.js
=== modified file 'win/configure.js'
--- a/win/configure.js	2010-02-03 17:22:58 +0000
+++ b/win/configure.js	2010-02-18 14:40:00 +0000
@@ -32,6 +32,7 @@ try 
     var default_comment = "Source distribution";
     var default_port = GetValue(configureIn, "MYSQL_TCP_PORT_DEFAULT");
     var actual_port = 0;
+    var build_embedded_server = 1;
 
     var configfile = fso.CreateTextFile("win\\configure.data", true);
     for (i=0; i < args.Count(); i++)
@@ -46,6 +47,12 @@ try 
             case "WITHOUT_ATOMICS":
                     configfile.WriteLine("SET (" + args.Item(i) + " TRUE)");
                     break;
+            case "WITHOUT_EMBEDDED_SERVER":
+                    build_embedded_server = 0;
+                    break;
+            case "WITH_EMBEDDED_SERVER":
+                    build_embedded_server = 1;
+                    break;
             case "MYSQL_SERVER_SUFFIX":
             case "MYSQLD_EXE_SUFFIX":
                     configfile.WriteLine("SET (" + parts[0] + " \""
@@ -60,6 +67,10 @@ try 
         }
     }
 
+    if (build_embedded_server == 1)
+	{
+           configfile.WriteLine("SET(WITH_EMBEDDED_SERVER TRUE)");
+        }
     if (actual_port == 0)
 	{
        // if we actually defaulted (as opposed to the pathological case of


Attachment: [text/bzr-bundle] bzr/[e-mail]