1 files changed, 85 insertions, 32 deletions
diff --git a/packaging/WiX/extra.wxs.in b/packaging/WiX/extra.wxs.in
index b1286bfba61..78e6f96dbcc 100644
--- a/packaging/WiX/extra.wxs.in
+++ b/packaging/WiX/extra.wxs.in
@@ -1,32 +1,85 @@
-<Wix xmlns="http://schemas.microsoft.com/wix/2006/wi">
-  <Fragment>
-    <DirectoryRef Id="INSTALLDIR">
-      <Component Id="RegKeys" Guid="*">
-        <RegistryKey
-          Id='MySQLKey'
-          Root='HKLM'
-          Key='SOFTWARE\MySQL AB\[ProductName]'
-          Action='createAndRemoveOnUninstall'>
-          <RegistryValue
-            Type='string'
-            Name='Location'
-            Value='[INSTALLDIR]'/>
-          <RegistryValue
-            Type="string"
-            Name="Version"
-            Value="[ProductVersion]"/>
-          <RegistryValue
-            Type="string"
-            Name="DataLocation"
-            Value="[DATADIR]"/>
-        </RegistryKey>
-      </Component>
-    </DirectoryRef>
-    <Feature
-      Id='RegKeys'
-      Display='hidden'
-      Level='1'>
-      <ComponentRef Id='RegKeys'/>
-    </Feature>
-  </Fragment>
-</Wix>
-\ No newline at end of file
+<Include xmlns="http://schemas.microsoft.com/wix/2006/wi"
+         xmlns:util="http://schemas.microsoft.com/wix/UtilExtension">
+  <DirectoryRef Id='TARGETDIR'>
+    <Component Id="RegKeys" Guid="*">
+      <RegistryKey
+        Id='MySQLKey'
+        Root='HKLM'
+        Key='SOFTWARE\MySQL AB\[ProductName]'
+        Action='createAndRemoveOnUninstall'>
+        <RegistryValue
+          Type='string'
+          Name='Location'
+          Value='[INSTALLDIR]'/>
+        <RegistryValue
+          Type="string"
+          Name="Version"
+          Value="[ProductVersion]"/>
+        <RegistryValue
+          Type="string"
+          Name="DataLocation"
+          Value="[DATADIR]"/>
+      </RegistryKey>
+    </Component>
+  </DirectoryRef>
+
+  <Feature
+    Id='RegKeys'
+    Display='hidden'
+    Level='1'>
+    <ComponentRef Id='RegKeys'/>
+  </Feature>
+
+  <!-- Datafiles that installation will copy to CommonAppData (initial database)
+  They are declared Permanent and NeverOverwrite since it is user data -->
+  <DirectoryRef Id='TARGETDIR'>
+    <Directory Id="CommonAppDataFolder">
+      <Directory Id="datadir.mysql" Name="MySQL">
+        <Directory Id="datadir.mysql.mysqlserver"
+          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>
+            </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">
+                  @DATADIR_MYSQL_FILES@
+                </Component>
+              </Directory>
+              <Directory Id="datadir.mysql.mysqlserver.data.performance_schema"
+                 Name="performance_schema">
+                <Component Id="component.datadir.performance_schema"
+                  Guid="af2a6776-2655-431f-a748-9e9f4645acc3"
+                  Permanent="yes" NeverOverwrite="yes">
+                  @DATADIR_PERFORMANCE_SCHEMA_FILES@
+                </Component>
+              </Directory>
+              <Directory Id="datadir.mysql.mysqlserver.data.test" Name="test">
+                <Component Id="component.datadir.test" Guid="52fa9f0a-fcd1-420a-b2ac-95a8f70ad20a">
+                  <CreateFolder/>
+                </Component>
+              </Directory>
+            </Directory>
+          </Directory>
+        </Directory>
+      </Directory>
+    </Directory>
+  </DirectoryRef>
+
+
+  <Feature Id="UserEditableDatafiles" Level='1' Display='hidden'  ConfigurableDirectory="DATADIR">
+   <ComponentRef Id="component.datadir"/>
+    <ComponentRef Id="component.datadir.mysql"/>
+    <ComponentRef Id="component.datadir.performance_schema"/>
+    <ComponentRef Id="component.datadir.test"/>
+  </Feature>
+</Include>
+
+
+