diff options
| -rw-r--r-- | win/packaging/ca/CustomAction.cpp | 2 | ||||
| -rw-r--r-- | win/packaging/extra.wxs.in | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/win/packaging/ca/CustomAction.cpp b/win/packaging/ca/CustomAction.cpp index 71c24e96f92..7ba061c108a 100644 --- a/win/packaging/ca/CustomAction.cpp +++ b/win/packaging/ca/CustomAction.cpp @@ -355,7 +355,7 @@ void CheckServiceConfig( goto end; } - WcaLog(LOGMSG_STANDARD, "MySQL service %S found: CommandLine= %S", + WcaLog(LOGMSG_STANDARD, "MySQL/MariaDB service %S found: CommandLine= %S", other_servicename, commandline); if (wcsstr(argv[0], bindir)) { diff --git a/win/packaging/extra.wxs.in b/win/packaging/extra.wxs.in index 7a9168d394a..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> |