diff options
| author | Daniel Fischer <df@sun.com> | 2010-04-30 17:12:01 +0200 |
|---|---|---|
| committer | Daniel Fischer <df@sun.com> | 2010-04-30 17:12:01 +0200 |
| commit | bfe544e46b6873500f171ac8ef3a8322cf88f7e6 (patch) | |
| tree | d3806bd900144bcd7c788d31f8bd3643084090ba /packaging | |
| parent | fdf36464b385727f4426f754124dc542367d62d7 (diff) | |
| download | mariadb-git-bfe544e46b6873500f171ac8ef3a8322cf88f7e6.tar.gz | |
WiX is worried that we aren't going to create these directories after all, so let's reaffirm our intention to do so.
Diffstat (limited to 'packaging')
| -rw-r--r-- | packaging/WiX/extra.wxs.in | 12 |
1 files changed, 9 insertions, 3 deletions
diff --git a/packaging/WiX/extra.wxs.in b/packaging/WiX/extra.wxs.in index 4957071526b..b6c42136129 100644 --- a/packaging/WiX/extra.wxs.in +++ b/packaging/WiX/extra.wxs.in @@ -10,15 +10,18 @@ Name="MySQL Server @MAJOR_VERSION@.@MINOR_VERSION@">
<Directory Id="DATADIR" Name=".">
<Component Id="component.datadir" Guid="d3491319-5dbc-4477-95f3-4f809ef1dd2d">
- <CreateFolder>
- <util:PermissionEx User="[LogonUser]" GenericAll="yes" />
- </CreateFolder>
+ <CreateFolder>
+ <util:PermissionEx User="[LogonUser]" GenericAll="yes" />
+ </CreateFolder>
</Component>
<Directory Id="datadir.mysql.mysqlserver.data" Name="data">
<Directory Id="datadir.mysql.mysqlserver.data.mysql" Name="mysql">
<Component Id="component.datadir.mysql"
Guid="19ec0f1f-1a7f-424e-a788-b09346c0a709"
Permanent="yes" NeverOverwrite="yes">
+ <CreateFolder>
+ <util:PermissionEx User="[LogonUser]" GenericAll="yes" />
+ </CreateFolder>
@DATADIR_MYSQL_FILES@
</Component>
</Directory>
@@ -27,6 +30,9 @@ <Component Id="component.datadir.performance_schema"
Guid="af2a6776-2655-431f-a748-9e9f4645acc3"
Permanent="yes" NeverOverwrite="yes">
+ <CreateFolder>
+ <util:PermissionEx User="[LogonUser]" GenericAll="yes" />
+ </CreateFolder>
@DATADIR_PERFORMANCE_SCHEMA_FILES@
</Component>
</Directory>
|