Merge branch 'mysql-5.6' into mysql-5.7

Piotr Obrzut · Piotr Obrzut · commit 0f6316304e64 · 2017-04-06T13:22:41.000+02:00
(cherry picked from commit 09b50ab8c41db000561d92809e48755b907c149b)
diff --git a/packaging/WiX/mysql_server_extra.wxs.in b/packaging/WiX/mysql_server_extra.wxs.in
@@ -69,7 +69,7 @@
       <RegistryKey
         Id='MySQLKey'
         Root='HKLM'
-        Key='SOFTWARE\MySQL AB\@PRODUCT_NAME@ @MAJOR_VERSION@.@MINOR_VERSION@'
+        Key='SOFTWARE\MySQL AB\[ProductName]'
         Action='createAndRemoveOnUninstall'>
         <RegistryValue
           Type='string'
