10.0-base merge

(without InnoDB - all InnoDB changes were ignored)

3 files changed, 12 insertions, 7 deletions

diff --git a/win/packaging/ca/CustomAction.cpp b/win/packaging/ca/CustomAction.cpp
index 50b39adc0b1..67a17c2cc19 100644
--- a/win/packaging/ca/CustomAction.cpp
+++ b/win/packaging/ca/CustomAction.cpp
@@ -895,7 +895,7 @@ extern "C" UINT __stdcall CheckServiceUpgrades(MSIHANDLE hInstall)
           Only look for services that have mysqld.exe outside of the current
           installation directory.
         */
-       if(strstr(props.mysqld_exe,installDir) == 0)
+       if(installDir[0] == 0 || strstr(props.mysqld_exe,installDir) == 0)
         {
            WcaLog(LOGMSG_STANDARD, "found service %S, major=%d, minor=%d",
             info[i].lpServiceName, props.version_major, props.version_minor);
diff --git a/win/packaging/extra.wxs.in b/win/packaging/extra.wxs.in
index ff1a529a2ee..da4ac6aa9ac 100644
--- a/win/packaging/extra.wxs.in
+++ b/win/packaging/extra.wxs.in
@@ -151,6 +151,9 @@
         <Control Id="Next" Type="PushButton" X="236" Y="243" Width="56" Height="17" Text="&amp;Next">

           <Publish Event="Remove" Value="DBInstance">CreateOrUpgradeChoice = "Upgrade" </Publish>

           <Publish Event="AddLocal" Value="DBInstance">CreateOrUpgradeChoice = "Create"</Publish>

+          <Publish Property="WIXUI_EXITDIALOGOPTIONALCHECKBOX" Value="[NonExistentProperty]">CreateOrUpgradeChoice = "Create"</Publish>

+          <Publish Property="WIXUI_EXITDIALOGOPTIONALCHECKBOXTEXT" Value="[NonExistentProperty]">CreateOrUpgradeChoice = "Create"</Publish>

+          <Publish Property="WIXUI_EXITDIALOGOPTIONALCHECKBOX" Value="1">CreateOrUpgradeChoice = "Upgrade"</Publish>

           <Publish Event="NewDialog" Value="CustomizeDlg">1</Publish>

         </Control>

         <Control Id="Cancel" Type="PushButton" X="304" Y="243" Width="56" Height="17" Cancel="yes" Text="Cancel">

@@ -634,6 +637,7 @@
       </Component>

      <?if $(var.HaveUpgradeWizard) != "0" ?>

      <ComponentRef Id='C.bin.mysql_upgrade_wizard.exe'/>

+     <!--

      <Component Id="c.shortcuts.upgrade_wizard"  Guid="*"  Directory="ShortcutFolder" Transitive="yes">

        <RegistryValue

        Root="HKCU" Key="Software\@CPACK_WIX_PACKAGE_NAME@\Uninstall"

@@ -646,6 +650,7 @@
        Description="Upgrades older instances of MariaDB/MySQL services to version @MAJOR_VERSION@.@MINOR_VERSION@"  

        Advertise="no"/>

      </Component>

+     -->

      <?endif?>

     </Feature>

 

@@ -689,7 +694,7 @@
     <CustomAction Id='PresetDatabaseProperties' BinaryKey='wixca.dll' DllEntry='PresetDatabaseProperties' />

     <CustomAction Id="CreateDatabaseCommand" Property="CreateDatabase"

     Value=

-    "&quot;[#F.bin.mysql_install_db.exe]&quot;  &quot;--service=[SERVICENAME]&quot; --port=[PORT] &quot;--password=[ESCAPEDPASSWORD]&quot; &quot;--datadir=[DATADIR]\&quot; [SKIPNETWORKING] [ALLOWREMOTEROOTACCESS] [DEFAULTUSER]"

+    "&quot;[#F.bin.mysql_install_db.exe]&quot;  &quot;--service=[SERVICENAME]&quot; --port=[PORT] &quot;--password=[ESCAPEDPASSWORD]&quot; &quot;--datadir=[DATADIR]\&quot; [SKIPNETWORKING] [ALLOWREMOTEROOTACCESS] [DEFAULTUSER] --verbose-bootstrap"

      Execute="immediate"

      HideTarget="yes"

      />

@@ -823,7 +828,7 @@
     <Property 

       Id="WIXUI_EXITDIALOGOPTIONALCHECKBOXTEXT" 

       Value="Launch wizard to upgrade existing MariaDB or MySQL services." />

-    <Property Id="WIXUI_EXITDIALOGOPTIONALCHECKBOX" Value="1"/>

+    <Property Id="WIXUI_EXITDIALOGOPTIONALCHECKBOX" Value="0"/>

     <Property Id="WixShellExecTarget" Value="[#F.bin.mysql_upgrade_wizard.exe]" />

     <CustomAction Id="LaunchApplication"

         BinaryKey="WixCA"

@@ -835,16 +840,16 @@
       Execute="immediate" />

     <InstallUISequence>

       <Custom Action="CheckServiceUpgrades" After="CostFinalize">

-        $C.bin.mysql_upgrade_wizard.exe = 3 AND NOT Installed

+        $C.bin.mysql_upgrade_wizard.exe = 3 AND NOT Installed AND NOT OLDERVERSIONBEINGUPGRADED

       </Custom>

     </InstallUISequence>

     <SetProperty Before="ExecuteAction" Id="WIXUI_EXITDIALOGOPTIONALCHECKBOXTEXT" 

        Sequence="ui"  Value="[NonExistentProperty]">

-      <![CDATA[($C.bin.mysql_upgrade_wizard.exe <> 3) AND NOT Installed]]>

+      <![CDATA[($C.bin.mysql_upgrade_wizard.exe <> 3) AND NOT Installed OR OLDERVERSIONBEINGUPGRADED]]>

     </SetProperty>

     <SetProperty Before="ExecuteAction" Id="WIXUI_EXITDIALOGOPTIONALCHECKBOX" 

        Sequence="ui"  Value="[NonExistentProperty]">

-      <![CDATA[($C.bin.mysql_upgrade_wizard.exe <> 3) AND NOT Installed]]>

+      <![CDATA[($C.bin.mysql_upgrade_wizard.exe <> 3) AND NOT Installed OR OLDERVERSIONBEINGUPGRADED]]>

     </SetProperty>

     

     <?endif ?> <!-- HaveUpgradeWizard -->

diff --git a/win/packaging/heidisql.cmake b/win/packaging/heidisql.cmake
index f826c9a6633..124f85bb87e 100644
--- a/win/packaging/heidisql.cmake
+++ b/win/packaging/heidisql.cmake
@@ -1,4 +1,4 @@
-SET(HEIDISQL_BASE_NAME "HeidiSQL_7.0_Portable")

+SET(HEIDISQL_BASE_NAME "HeidiSQL_8.0_Portable")

 SET(HEIDISQL_ZIP "${HEIDISQL_BASE_NAME}.zip")

 SET(HEIDISQL_URL "http://heidisql.googlecode.com/files/${HEIDISQL_ZIP}")

 SET(HEIDISQL_DOWNLOAD_DIR ${THIRD_PARTY_DOWNLOAD_LOCATION}/${HEIDISQL_BASE_NAME})