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

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

CMakeLists.txt

@@ -174,7 +174,7 @@ IF(EMBED_MANIFESTS)
     ENDIF(NOT tmp_manifest)
     # Set the processor architecture.
     IF(CMAKE_GENERATOR MATCHES "Visual Studio 8 2005 Win64")
-    	SET(PROCESSOR_ARCH "X64") 
+    	SET(PROCESSOR_ARCH "amd64") 
     ELSE(CMAKE_GENERATOR MATCHES "Visual Studio 8 2005 Win64")
     	SET(PROCESSOR_ARCH "X86")
     ENDIF(CMAKE_GENERATOR MATCHES "Visual Studio 8 2005 Win64")

win/create_manifest.js

 /* 
   manifest.js - Writes a custom XML manifest for each executable/library
-  6 command line options must be supplied: 
+  5 command line options must be supplied: 
   name      - Name of the executable/library into which the mainfest will be 
               embedded.
   version   - Version of the executable 
   arch      - Architecture intended.
-  type      - Application type.
   exe_level - Application execution level. 
               [asInvoker|highestAvailable|requireAdministrator]
   outfile   - Final destination where mainfest will be written.
@@ -37,9 +36,6 @@ try
       case "arch":
            var app_arch= parts[1];
            break;
-      case "type":
-           var app_type= parts[1];
-           break;
       case "exe_level":
 		   var app_exe_level= parts[1];
            break;
@@ -50,7 +46,7 @@ try
 	       WScript.echo("Invalid argument supplied.");
     }
   }
-  if (i != 6)
+  if (i != 5)
     throw new Error(1, "Incorrect number of arguments.");
 
   var manifest_xml= "<?xml version=\'1.0\' encoding=\'UTF-8\' standalone=\'yes\'?>\r\n";
@@ -61,7 +57,7 @@ try
   manifest_xml+= " version=\'" + app_version + "\'"; 
   manifest_xml+= " processorArchitecture=\'" + app_arch + "\'";
   // TOADD - Add publicKeyToken attribute once we have Authenticode key.
-  manifest_xml+= " type=\'" + app_type + "\' />\r\n";
+  manifest_xml+= " type=\'win32\' />\r\n";
   // Identify the application security requirements.
   manifest_xml+= "\t<trustInfo xmlns=\'urn:schemas-microsoft-com:asm.v2\'>\r\n"; 
   manifest_xml+= "\t\t<security>\r\n\t\t\t<requestedPrivileges>\r\n\t\t\t\t";

win/mysql_manifest.cmake

@@ -9,7 +9,7 @@ MACRO(MYSQL_EMBED_MANIFEST _target_name _required_privs)
     TARGET ${_target_name}
     PRE_LINK
     COMMAND cscript.exe 
-    ARGS "${PROJECT_SOURCE_DIR}/win/create_manifest.js" name=$(ProjectName) version=${VERSION} arch=${PROCESSOR_ARCH} type=$(PlatformName) exe_level=${_required_privs} outfile=$(IntDir)\\$(TargetFileName).intermediate.manifest
+    ARGS "${PROJECT_SOURCE_DIR}/win/create_manifest.js" name=$(ProjectName) version=${VERSION} arch=${PROCESSOR_ARCH} exe_level=${_required_privs} outfile=$(IntDir)\\$(TargetFileName).intermediate.manifest
     COMMENT "Generates the contents of the manifest contents.")
   ADD_CUSTOM_COMMAND(
     TARGET ${_target_name}