Merge bk-internal.mysql.com:/home/bk/mysql-5.1-maint

into  amd64.(none):/src/bug24732/my51-bug24732

CMakeLists.txt

@@ -157,7 +157,7 @@ IF(EMBED_MANIFESTS)
     STRING(REGEX MATCH "MANIFEST:NO" tmp_manifest ${CMAKE_EXE_LINKER_FLAGS})
     IF(NOT tmp_manifest)
         SET(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} /MANIFEST:NO")
-    ENDIF(tmp_manifest)
+    ENDIF(NOT tmp_manifest)
     # Set the processor architecture.
     IF(CMAKE_GENERATOR MATCHES "Visual Studio 8 2005 Win64")
     	SET(PROCESSOR_ARCH "X64") 

win/create_manifest.js

@@ -27,7 +27,11 @@ try
            var app_name= parts[1];
            break;
       case "version":
-           var app_version= parts[1];
+           var supp_version= parts[1];
+           // Clean up the supplied version string.
+           var end= supp_version.indexOf("-");
+           if (end == -1) end= supp_version.length;
+           var app_version= supp_version.substring(0, end);
            app_version+= ".0";
            break;
       case "arch":