Commit 3f4138a5 authored by iggy@amd64.(none)'s avatar iggy@amd64.(none)

Bug#24732 Executables do not include Vista manifests

- Manifest requires four part application version.
- mysqld does not need requireAdministrator rights 
to run.
parent f924d84c
...@@ -86,7 +86,7 @@ TARGET_LINK_LIBRARIES(mysqld heap myisam myisammrg mysys yassl zlib dbug yassl ...@@ -86,7 +86,7 @@ TARGET_LINK_LIBRARIES(mysqld heap myisam myisammrg mysys yassl zlib dbug yassl
taocrypt strings vio regex wsock32) taocrypt strings vio regex wsock32)
IF(EMBED_MANIFESTS) IF(EMBED_MANIFESTS)
MYSQL_EMBED_MANIFEST("mysqld" "requireAdministrator") MYSQL_EMBED_MANIFEST("mysqld" "asInvoker")
ENDIF(EMBED_MANIFESTS) ENDIF(EMBED_MANIFESTS)
IF(WITH_EXAMPLE_STORAGE_ENGINE) IF(WITH_EXAMPLE_STORAGE_ENGINE)
......
...@@ -28,6 +28,7 @@ try ...@@ -28,6 +28,7 @@ try
break; break;
case "version": case "version":
var app_version= parts[1]; var app_version= parts[1];
app_version+= ".0";
break; break;
case "arch": case "arch":
var app_arch= parts[1]; var app_arch= parts[1];
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment