Merge from mysql-5.5.8-release

3 files changed, 27 insertions, 10 deletions

diff --git a/packaging/WiX/CMakeLists.txt b/packaging/WiX/CMakeLists.txt
index 052887f10a1..4048273fc03 100644
--- a/packaging/WiX/CMakeLists.txt
+++ b/packaging/WiX/CMakeLists.txt
@@ -63,7 +63,12 @@ FIND_PROGRAM(LIGHT_EXECUTABLE light ${WIX_DIR})
 IF(EXISTS "${CMAKE_CURRENT_SOURCE_DIR}/COPYING.rtf")
  SET(COPYING_RTF "${CMAKE_CURRENT_SOURCE_DIR}/COPYING.rtf")
 ELSE()
-  FILE(READ "${CMAKE_CURRENT_SOURCE_DIR}/../../COPYING" CONTENTS)
+  IF(EXISTS "${CMAKE_CURRENT_SOURCE_DIR}/../../LICENSE.mysql")
+    SET(LICENSE_FILE "${CMAKE_CURRENT_SOURCE_DIR}/../../LICENSE.mysql")
+  ELSE()
+    SET(LICENSE_FILE "${CMAKE_CURRENT_SOURCE_DIR}/../../COPYING")
+  ENDIF()
+  FILE(READ ${LICENSE_FILE} CONTENTS)
   STRING(REGEX REPLACE "\n" "\\\\par\n" CONTENTS "${CONTENTS}")
   STRING(REGEX REPLACE "\t" "\\\\tab" CONTENTS "${CONTENTS}")
   FILE(WRITE "${CMAKE_CURRENT_BINARY_DIR}/COPYING.rtf" "{\\rtf1\\ansi\\deff0{\\fonttbl{\\f0\\fnil\\fcharset0 Courier New;}}\\viewkind4\\uc1\\pard\\lang1031\\f0\\fs15")
diff --git a/packaging/WiX/create_msi.cmake.in b/packaging/WiX/create_msi.cmake.in
index adc3cf4c4dd..a1899b701fd 100644
--- a/packaging/WiX/create_msi.cmake.in
+++ b/packaging/WiX/create_msi.cmake.in
@@ -7,7 +7,7 @@ SET(CMAKE_CFG_INTDIR "@CMAKE_CFG_INTDIR@")
 SET(VERSION "@VERSION@")

 SET(MAJOR_VERSION "@MAJOR_VERSION@")

 SET(MINOR_VERSION "@MINOR_VERSION@")

-SET(PATCH "@PATCH@")

+SET(PATCH_VERSION "@PATCH_VERSION@")

 SET(CMAKE_SIZEOF_VOID_P @CMAKE_SIZEOF_VOID_P@)

 SET(MANUFACTURER "@MANUFACTURER@")

 SET(WIXCA_LOCATION "@WIXCA_LOCATION@")

@@ -27,6 +27,12 @@ ENDIF()
 

 SET(ENV{VS_UNICODE_OUTPUT})

 

+# Switch off the monolithic install

+EXECUTE_PROCESS(

+  COMMAND ${CMAKE_COMMAND} -DCPACK_MONOLITHIC_INSTALL=0 ${CMAKE_BINARY_DIR}

+  OUTPUT_QUIET

+)

+

 INCLUDE(${CMAKE_BINARY_DIR}/CPackConfig.cmake)

 

 IF(CPACK_WIX_CONFIG)

@@ -318,3 +324,9 @@ EXECUTE_PROCESS(
   ${EXTRA_LIGHT_ARGS}

 )

 

+# Switch monolithic install on again

+EXECUTE_PROCESS(

+  COMMAND ${CMAKE_COMMAND} -DCPACK_MONOLITHIC_INSTALL=1 ${CMAKE_BINARY_DIR}

+  OUTPUT_QUIET

+)

+

diff --git a/packaging/WiX/mysql_server.wxs.in b/packaging/WiX/mysql_server.wxs.in
index 59cc817a302..43a30538384 100644
--- a/packaging/WiX/mysql_server.wxs.in
+++ b/packaging/WiX/mysql_server.wxs.in
@@ -4,7 +4,7 @@
     Id="*" 

     UpgradeCode="49EB7A6A-1CEF-4A1E-9E89-B9A4993963E3"

     Name="MySQL Server @MAJOR_VERSION@.@MINOR_VERSION@" 

-    Version="@MAJOR_VERSION@.@MINOR_VERSION@.@PATCH@" 

+    Version="@MAJOR_VERSION@.@MINOR_VERSION@.@PATCH_VERSION@" 

     Language="1033" 

     Manufacturer="@MANUFACTURER@">

     

@@ -25,12 +25,12 @@
       <UpgradeVersion 

         Minimum="@MAJOR_VERSION@.@MINOR_VERSION@.0"

         IncludeMinimum="yes"

-        Maximum="@MAJOR_VERSION@.@MINOR_VERSION@.@PATCH@"

+        Maximum="@MAJOR_VERSION@.@MINOR_VERSION@.@PATCH_VERSION@"

         Property="OLDERVERSIONBEINGUPGRADED"

         MigrateFeatures="yes"

         />

       <UpgradeVersion 

-        Minimum="@MAJOR_VERSION@.@MINOR_VERSION@.@PATCH@"

+        Minimum="@MAJOR_VERSION@.@MINOR_VERSION@.@PATCH_VERSION@"

         OnlyDetect="yes"

         Property="NEWERVERSIONDETECTED" />

     </Upgrade>

@@ -128,10 +128,10 @@
                   Impersonate="no"

                   Return="check" />

     <InstallExecuteSequence>

-      <Custom Action="UnregisterProperty" After="InstallInitialize">Installed And Not UPGRADINGPRODUCTCODE</Custom>

-      <Custom Action="UnregisterPropertySilent" After="InstallInitialize">Installed And Not UPGRADINGPRODUCTCODE</Custom>

-      <Custom Action="UnregisterService" After="UnregisterProperty">Installed And Not UPGRADINGPRODUCTCODE And UILevel&gt;4</Custom>

-      <Custom Action="UnregisterServiceSilently" After="UnregisterPropertySilent">Installed And Not UPGRADINGPRODUCTCODE And UILevel&lt;=4</Custom>

+      <Custom Action="UnregisterProperty" After="InstallInitialize">Installed And Not UPGRADINGPRODUCTCODE And REMOVE="ALL"</Custom>

+      <Custom Action="UnregisterPropertySilent" After="InstallInitialize">Installed And Not UPGRADINGPRODUCTCODE And REMOVE="ALL"</Custom>

+      <Custom Action="UnregisterService" After="UnregisterProperty">Installed And Not UPGRADINGPRODUCTCODE And REMOVE="ALL" And UILevel&gt;4</Custom>

+      <Custom Action="UnregisterServiceSilently" After="UnregisterPropertySilent">Installed And Not UPGRADINGPRODUCTCODE And REMOVE="ALL" And UILevel&lt;=4</Custom>

     </InstallExecuteSequence>

 

     <!-- Installation root-->

@@ -160,4 +160,4 @@
     @CPACK_WIX_INCLUDES@

   </Product>

 

-</Wix>
\ No newline at end of file
+</Wix>