From 8d75f11a67d620727b87ef3a00d61a6f92418817 Mon Sep 17 00:00:00 2001 From: Vladislav Vaintroub Date: Tue, 30 Apr 2013 00:29:47 +0200 Subject: MDEV-4458 - Windows installer does not launch upgrade wizard anymore, even if there are upgradable instances (i.e windows service of lower MariaDB/MySQL version) The main reason for he error is misplaced ADD_DIRECTORY in top-level CMakeLists.txt. ADD_DIRECTORY(win/packaging) was places before win/upgrade_wizard, and MSI was not able to detect that upgrade wizard was built, and thus excluded upgrade wizard entirely. --- win/packaging/ca/CustomAction.cpp | 2 +- win/packaging/extra.wxs.in | 11 +++++++---- 2 files changed, 8 insertions(+), 5 deletions(-) (limited to 'win/packaging') 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..e0a36ef2e41 100644 --- a/win/packaging/extra.wxs.in +++ b/win/packaging/extra.wxs.in @@ -151,6 +151,9 @@ CreateOrUpgradeChoice = "Upgrade" CreateOrUpgradeChoice = "Create" + CreateOrUpgradeChoice = "Create" + CreateOrUpgradeChoice = "Create" + CreateOrUpgradeChoice = "Upgrade" 1 @@ -823,7 +826,7 @@ - + - $C.bin.mysql_upgrade_wizard.exe = 3 AND NOT Installed + $C.bin.mysql_upgrade_wizard.exe = 3 AND NOT Installed AND NOT OLDERVERSIONBEINGUPGRADED - 3) AND NOT Installed]]> + 3) AND NOT Installed OR OLDERVERSIONBEINGUPGRADED]]> - 3) AND NOT Installed]]> + 3) AND NOT Installed OR OLDERVERSIONBEINGUPGRADED]]> -- cgit v1.2.1 From 55b3c844921580be362c16d3226c287a2f92ea96 Mon Sep 17 00:00:00 2001 From: Vladislav Vaintroub Date: Thu, 9 May 2013 22:21:07 +0200 Subject: Small mysql_install_db.exe fixes - Use lc-messages-dir instead of deprecated --language when running mysqld in bootstrap mode. - Add some verbosity to mysql_install_db.exe when it runs in course of MSI installation. --- win/packaging/extra.wxs.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'win/packaging') diff --git a/win/packaging/extra.wxs.in b/win/packaging/extra.wxs.in index e0a36ef2e41..124de5f4b40 100644 --- a/win/packaging/extra.wxs.in +++ b/win/packaging/extra.wxs.in @@ -692,7 +692,7 @@ -- cgit v1.2.1 From b67ec975dcc0c4efcce14e8d5b967d8e38540d77 Mon Sep 17 00:00:00 2001 From: Vladislav Vaintroub Date: Sun, 19 May 2013 17:41:22 +0200 Subject: MDEV-4544 : Update MSI installer to use latest HeidiSQL 8.0 --- win/packaging/heidisql.cmake | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'win/packaging') 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}) -- cgit v1.2.1 From db7085dfae07e8cf4e98e41bd0dc111fb1b4896b Mon Sep 17 00:00:00 2001 From: Vladislav Vaintroub Date: Sun, 19 May 2013 17:42:30 +0200 Subject: remove start menu shortcut to upgrade wizard --- win/packaging/extra.wxs.in | 2 ++ 1 file changed, 2 insertions(+) (limited to 'win/packaging') diff --git a/win/packaging/extra.wxs.in b/win/packaging/extra.wxs.in index 124de5f4b40..da4ac6aa9ac 100644 --- a/win/packaging/extra.wxs.in +++ b/win/packaging/extra.wxs.in @@ -637,6 +637,7 @@ + -- cgit v1.2.1