diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2021-06-08 16:03:53 +0300 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2021-06-08 16:03:53 +0300 |
| commit | f4425d3a3dbe5638daceb41dca4dfdb5eba1ffaf (patch) | |
| tree | 88134dff388f88041cd557eb53bc262667f51f96 /win | |
| parent | bf5c050fd28f616d789a02b0fbd6fd8ff53c78d3 (diff) | |
| parent | b8d38c5e39d526e006f4e8e8977ac4c6166bc4c6 (diff) | |
| download | mariadb-git-f4425d3a3dbe5638daceb41dca4dfdb5eba1ffaf.tar.gz | |
Merge 10.4 into 10.5
Diffstat (limited to 'win')
| -rw-r--r-- | win/packaging/heidisql.cmake | 2 | ||||
| -rw-r--r-- | win/upgrade_wizard/upgradeDlg.cpp | 5 |
2 files changed, 5 insertions, 2 deletions
diff --git a/win/packaging/heidisql.cmake b/win/packaging/heidisql.cmake index fab86048adb..b406e918b8f 100644 --- a/win/packaging/heidisql.cmake +++ b/win/packaging/heidisql.cmake @@ -1,4 +1,4 @@ -SET(HEIDISQL_BASE_NAME "HeidiSQL_11.2_32_Portable") +SET(HEIDISQL_BASE_NAME "HeidiSQL_11.3_32_Portable") SET(HEIDISQL_ZIP "${HEIDISQL_BASE_NAME}.zip") SET(HEIDISQL_URL "http://www.heidisql.com/downloads/releases/${HEIDISQL_ZIP}") SET(HEIDISQL_DOWNLOAD_DIR ${THIRD_PARTY_DOWNLOAD_LOCATION}/${HEIDISQL_BASE_NAME}) diff --git a/win/upgrade_wizard/upgradeDlg.cpp b/win/upgrade_wizard/upgradeDlg.cpp index 793e89886d6..a1b6c279fa6 100644 --- a/win/upgrade_wizard/upgradeDlg.cpp +++ b/win/upgrade_wizard/upgradeDlg.cpp @@ -367,7 +367,10 @@ void CUpgradeDlg::UpgradeOneService(const string& servicename) ErrorExit("Stdout SetHandleInformation"); string commandline("mysql_upgrade_service.exe --service="); + commandline += "\""; commandline += servicename; + commandline += "\""; + si.cb = sizeof(si); si.hStdInput= GetStdHandle(STD_INPUT_HANDLE); si.hStdOutput= hPipeWrite; @@ -397,7 +400,7 @@ void CUpgradeDlg::UpgradeOneService(const string& servicename) else { /* - Creating a process with CREATE_BREAKAWAY_FROM_JOB, reset this flag + Creating a process with CREATE_BREAKAWAY_FROM_JOB failed, reset this flag and retry. */ if (!CreateProcess(NULL, (LPSTR)commandline.c_str(), NULL, NULL, TRUE, |