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

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

sql/CMakeLists.txt

@@ -85,7 +85,7 @@ TARGET_LINK_LIBRARIES(mysqld heap myisam myisammrg mysys yassl zlib dbug yassl
                       taocrypt strings vio regex wsock32 ws2_32)
 
 IF(EMBED_MANIFESTS)
-  MYSQL_EMBED_MANIFEST("mysqld" "requireAdministrator")
+  MYSQL_EMBED_MANIFEST("mysqld" "asInvoker")
 ENDIF(EMBED_MANIFESTS)
 IF(WITH_ARCHIVE_STORAGE_ENGINE)
   TARGET_LINK_LIBRARIES(mysqld archive)

win/create_manifest.js

@@ -28,6 +28,7 @@ try
            break;
       case "version":
            var app_version= parts[1];
+           app_version+= ".0";
            break;
       case "arch":
            var app_arch= parts[1];