=== modified file 'packaging/WiX/CPackWixConfig.cmake'
--- packaging/WiX/CPackWixConfig.cmake	2010-06-30 21:08:12 +0000
+++ packaging/WiX/CPackWixConfig.cmake	2010-07-12 20:49:30 +0000
@@ -62,6 +62,7 @@
  SET(CPACK_COMPONENT_DATAFILES_GROUP "MySQLServer")
  SET(CPACK_COMPONENT_DATAFILES_DISPLAY_NAME "Server data files")
  SET(CPACK_COMPONENT_DATAFILES_DESCRIPTION "Server data files" )
+ SET(CPACK_COMPONENT_DATAFILES_HIDDEN 1)
  
  
 #Feature "Devel"

=== modified file 'packaging/WiX/extra.wxs.in'
--- packaging/WiX/extra.wxs.in	2010-04-30 15:12:01 +0000
+++ packaging/WiX/extra.wxs.in	2010-07-12 20:48:25 +0000
@@ -48,7 +48,11 @@
     </Directory>
   </DirectoryRef>
 
-  <Feature Id="UserEditableDatafiles" Level='1' Display='hidden'  ConfigurableDirectory="DATADIR">
+  <Feature Id='UserEditableDataFiles' 
+       Title='Server data files'
+       Description='Server data files'
+       ConfigurableDirectory='DATADIR'
+       Level='1'>
     <ComponentRef Id="component.datadir"/>
     <ComponentRef Id="component.datadir.mysql"/>
     <ComponentRef Id="component.datadir.performance_schema"/>

=== modified file 'packaging/WiX/mysql_server.wxs.in'
--- packaging/WiX/mysql_server.wxs.in	2010-06-28 00:12:12 +0000
+++ packaging/WiX/mysql_server.wxs.in	2010-07-12 20:06:56 +0000
@@ -26,7 +26,9 @@
         Minimum="@MAJOR_VERSION@.@MINOR_VERSION@.0"
         IncludeMinimum="yes"
         Maximum="@MAJOR_VERSION@.@MINOR_VERSION@.@PATCH@"
-        Property="OLDERVERSIONBEINGUPGRADED" />
+        Property="OLDERVERSIONBEINGUPGRADED"
+        MigrateFeatures="yes"
+        />
       <UpgradeVersion 
         Minimum="@MAJOR_VERSION@.@MINOR_VERSION@.@PATCH@"
         OnlyDetect="yes"
@@ -39,6 +41,28 @@
       <RemoveExistingProducts After="InstallInitialize"/>
     </InstallExecuteSequence>
 
+    <!-- Save/restore install location -->
+    <CustomAction Id="SaveTargetDir" Property="ARPINSTALLLOCATION" Value="[INSTALLDIR]" />
+    <InstallExecuteSequence>
+      <Custom Action="SaveTargetDir" After="InstallValidate">
+        NOT
+        Installed
+      </Custom>
+    </InstallExecuteSequence>
+	<InstallUISequence>
+      <!-- App search is what does FindInstallLocation, and it is dependent on FindRelatedProducts -->
+      <AppSearch After="FindRelatedProducts"/>
+	</InstallUISequence>
+ 
+    <!-- Find previous installation -->
+    <Property Id="INSTALLDIR">
+      <RegistrySearch Id="FindInstallLocation"
+          Root="HKLM"
+          Key="Software\Microsoft\Windows\CurrentVersion\Uninstall\[OLDERVERSIONBEINGUPGRADED]"
+          Name="InstallLocation"
+          Type="raw" />
+    </Property>
+
 
     <!-- UI -->
     <Property Id="WIXUI_INSTALLDIR" Value="INSTALLDIR"></Property>