summaryrefslogtreecommitdiff
path: root/win
diff options
context:
space:
mode:
authorMarko Mäkelä <marko.makela@mariadb.com>2021-11-17 15:03:47 +0200
committerMarko Mäkelä <marko.makela@mariadb.com>2021-11-17 15:03:47 +0200
commit0a168398a0a1f80ae9becab10c777cfe4631ea70 (patch)
treee34848f8d5044a60ad46f6652b4813a49915f810 /win
parent6841d1afddf8c9b433f98980f0ff0c940048b431 (diff)
parent5489ce0ae1cb5c5bd6d4e75ae587aadc6e4b4d48 (diff)
downloadmariadb-git-0a168398a0a1f80ae9becab10c777cfe4631ea70.tar.gz
Merge 10.5 into 10.6
Diffstat (limited to 'win')
-rw-r--r--win/upgrade_wizard/upgradeDlg.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/win/upgrade_wizard/upgradeDlg.cpp b/win/upgrade_wizard/upgradeDlg.cpp
index a1b6c279fa6..80f7c18f757 100644
--- a/win/upgrade_wizard/upgradeDlg.cpp
+++ b/win/upgrade_wizard/upgradeDlg.cpp
@@ -448,7 +448,7 @@ void CUpgradeDlg::UpgradeOneService(const string& servicename)
output_line.push_back(pipeReadBuf[0]);
}
}
- CloseHandle(hPipeWrite);
+ CloseHandle(hPipeRead);
if(WaitForSingleObject(pi.hProcess, INFINITE) != WAIT_OBJECT_0)
ErrorExit("WaitForSingleObject failed");