Skip to content

Commit 2f8ef92

Browse files
author
Piotr Obrzut
committed
Bug#29020892: PKGVER FAILED FOR WINDOWS X86-32 AND X86-64BIT CLUSTER MSI PACKAGES - BOTH COMMUNITY AND COMMERCIAL
WixQuietExec -> CAQuietExec. Branches built with older version of cmake need to use CAQuietExec instead of WixQuietExec. This change didn't get propagated from mysql-5.6 branch somehow. Additional fix: fixed the project install path for the service removal to match Cluster 7.3 default install path.
1 parent f62e640 commit 2f8ef92

File tree

1 file changed

+2
-2
lines changed

1 file changed

+2
-2
lines changed

packaging/WiX/mysql_server.wxs.in

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -168,8 +168,8 @@
168168
<Custom Action="SetInstallDir2" After="AppSearch">INSTALLDIR2</Custom>
169169
</InstallUISequence>
170170

171-
<Property Id="QtRemoveService" Value="&quot;cmd.exe&quot; /S /V:ON /C &quot;echo off &amp; for /F &quot;tokens=*&quot; %i in ('sc query ^| FIND &quot;SERVICE_NAME:&quot;') do (set j=%i &amp; set j=!j:~14! &amp; sc qc !j! | FIND &quot;C:\Program Files\MySQL\MySQL Server 5.6\bin\&quot; >NUL &amp; IF errorlevel 0 IF NOT errorlevel 1 (sc stop !j! > NUL &amp; ( for /L %k IN (1,1,20) do (sc query !j! | FIND &quot;STATE&quot; | FIND &quot;STOPPED&quot; >NUL &amp; (IF errorlevel 0 IF errorlevel 1 timeout /t 5 /nobreak >NUL)) )&amp; sc delete !j! ) ) &quot;"/>
172-
<CustomAction Id="QtRemoveService" BinaryKey="WixCA" DllEntry="WixQuietExec"
171+
<Property Id="QtRemoveService" Value="&quot;cmd.exe&quot; /S /V:ON /C &quot;echo off &amp; for /F &quot;tokens=*&quot; %i in ('sc query ^| FIND &quot;SERVICE_NAME:&quot;') do (set j=%i &amp; set j=!j:~14! &amp; sc qc !j! | FIND &quot;C:\Program Files\MySQL\MySQL Cluster 7.3\bin\&quot; >NUL &amp; IF errorlevel 0 IF NOT errorlevel 1 (sc stop !j! > NUL &amp; ( for /L %k IN (1,1,20) do (sc query !j! | FIND &quot;STATE&quot; | FIND &quot;STOPPED&quot; >NUL &amp; (IF errorlevel 0 IF errorlevel 1 timeout /t 5 /nobreak >NUL)) )&amp; sc delete !j! ) ) &quot;"/>
172+
<CustomAction Id="QtRemoveService" BinaryKey="WixCA" DllEntry="CAQuietExec"
173173
Execute="deferred" Return="check" Impersonate="no"/>
174174
<InstallExecuteSequence>
175175
<Custom Action="QtRemoveService" After="InstallInitialize">(NOT UPGRADINGPRODUCTCODE) AND (REMOVE="ALL") AND (NOT MYSQL_INSTALLER="YES")</Custom>

0 commit comments

Comments
 (0)