diff options
Diffstat (limited to 'win/packaging/extra.wxs.in')
| -rw-r--r-- | win/packaging/extra.wxs.in | 14 |
1 files changed, 12 insertions, 2 deletions
diff --git a/win/packaging/extra.wxs.in b/win/packaging/extra.wxs.in index a71ef982896..1955799f6f9 100644 --- a/win/packaging/extra.wxs.in +++ b/win/packaging/extra.wxs.in @@ -279,7 +279,7 @@ <Control Id="Next" Type="PushButton" X="236" Y="243" Width="56" Height="17" Default="yes" Text="&Next"> <Publish Property="WarningText" Value="Passwords do not match."><![CDATA[PASSWORD <> RootPasswordConfirm]]></Publish> <Publish Event="SpawnDialog" Value="WarningDlg"><![CDATA[WarningText <>""]]></Publish> - <Publish Property="SERVICENAME" Value="MySQL">NOT SERVICENAME AND NOT WarningText</Publish> + <Publish Property="SERVICENAME" Value="MariaDB">NOT SERVICENAME AND NOT WarningText</Publish> <Publish Event="NewDialog" Value="ServicePortDlg"><![CDATA[WarningText=""]]></Publish> <Condition Action="enable"><![CDATA[NOT ModifyRootPassword OR PASSWORD]]> </Condition> <Condition Action="disable"><![CDATA[ModifyRootPassword AND (NOT PASSWORD)]]> </Condition> @@ -650,7 +650,17 @@ </Feature> <?endif ?> - + + <?if "@VCRedist_MSM@" != "" ?> + <!-- VC runtime merge module --> + <DirectoryRef Id="TARGETDIR"> + <Merge Id="VCRedist" SourceFile="@VCRedist_MSM@" DiskId="1" Language="0"/> + </DirectoryRef> + <Feature Id="VCRedist" Title="Visual C++ Runtime" AllowAdvertise="no" Display="hidden" Level="1"> + <MergeRef Id="VCRedist"/> + </Feature> + <?endif?> + <!-- Custom action, call mysql_install_db --> <SetProperty Sequence='execute' Before='CreateDatabaseCommand' Id="SKIPNETWORKING" Value="--skip-networking" >SKIPNETWORKING</SetProperty> <SetProperty Sequence='execute' Before='CreateDatabaseCommand' Id="ALLOWREMOTEROOTACCESS" Value="--allow-remote-root-access">ALLOWREMOTEROOTACCESS</SetProperty> |