Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
M
MariaDB
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
nexedi
MariaDB
Commits
77109285
Commit
77109285
authored
Apr 29, 2019
by
Vladislav Vaintroub
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
MDEV-19354 : Change default service name in MSI UI to MariaDB.
parent
703a5ef1
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
2 additions
and
2 deletions
+2
-2
win/packaging/ca/CustomAction.cpp
win/packaging/ca/CustomAction.cpp
+1
-1
win/packaging/extra.wxs.in
win/packaging/extra.wxs.in
+1
-1
No files found.
win/packaging/ca/CustomAction.cpp
View file @
77109285
...
@@ -355,7 +355,7 @@ void CheckServiceConfig(
...
@@ -355,7 +355,7 @@ void CheckServiceConfig(
goto
end
;
goto
end
;
}
}
WcaLog
(
LOGMSG_STANDARD
,
"MySQL
service %S found: CommandLine= %S"
,
WcaLog
(
LOGMSG_STANDARD
,
"MySQL
/MariaDB service %S found: CommandLine= %S"
,
other_servicename
,
commandline
);
other_servicename
,
commandline
);
if
(
wcsstr
(
argv
[
0
],
bindir
))
if
(
wcsstr
(
argv
[
0
],
bindir
))
{
{
...
...
win/packaging/extra.wxs.in
View file @
77109285
...
@@ -279,7 +279,7 @@
...
@@ -279,7 +279,7 @@
<Control
Id=
"Next"
Type=
"PushButton"
X=
"236"
Y=
"243"
Width=
"56"
Height=
"17"
Default=
"yes"
Text=
"&Next"
>
<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
Property=
"WarningText"
Value=
"Passwords do not match."
>
<![CDATA[PASSWORD <> RootPasswordConfirm]]>
</Publish>
<Publish
Event=
"SpawnDialog"
Value=
"WarningDlg"
>
<![CDATA[WarningText <>""]]>
</Publish>
<Publish
Event=
"SpawnDialog"
Value=
"WarningDlg"
>
<![CDATA[WarningText <>""]]>
</Publish>
<Publish
Property=
"SERVICENAME"
Value=
"M
ySQL
"
>
NOT SERVICENAME AND NOT WarningText
</Publish>
<Publish
Property=
"SERVICENAME"
Value=
"M
ariaDB
"
>
NOT SERVICENAME AND NOT WarningText
</Publish>
<Publish
Event=
"NewDialog"
Value=
"ServicePortDlg"
>
<![CDATA[WarningText=""]]>
</Publish>
<Publish
Event=
"NewDialog"
Value=
"ServicePortDlg"
>
<![CDATA[WarningText=""]]>
</Publish>
<Condition
Action=
"enable"
>
<![CDATA[NOT ModifyRootPassword OR PASSWORD]]>
</Condition>
<Condition
Action=
"enable"
>
<![CDATA[NOT ModifyRootPassword OR PASSWORD]]>
</Condition>
<Condition
Action=
"disable"
>
<![CDATA[ModifyRootPassword AND (NOT PASSWORD)]]>
</Condition>
<Condition
Action=
"disable"
>
<![CDATA[ModifyRootPassword AND (NOT PASSWORD)]]>
</Condition>
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment