diff --git a/install/win/DocSpace.aip b/install/win/DocSpace.aip index dddf1b56b4..96b57413d0 100644 --- a/install/win/DocSpace.aip +++ b/install/win/DocSpace.aip @@ -1032,7 +1032,7 @@ - + @@ -1505,9 +1505,9 @@ - - - + + + @@ -1516,9 +1516,9 @@ - + - + @@ -1563,6 +1563,7 @@ + diff --git a/install/win/build-download-prereq.ps1 b/install/win/build-download-prereq.ps1 index 8844b3b51d..9f594be796 100644 --- a/install/win/build-download-prereq.ps1 +++ b/install/win/build-download-prereq.ps1 @@ -151,14 +151,14 @@ $enterprise_prerequisites = @( @{ download_allways = $false; - name = "mysql-connector-odbc-8.0.33-win32.msi"; - link = "https://cdn.mysql.com/archives/mysql-connector-odbc-8.0/mysql-connector-odbc-8.0.33-win32.msi"; + name = "mysql-connector-odbc-8.0.37-win32.msi"; + link = "https://cdn.mysql.com/Downloads/Connector-ODBC/8.0/mysql-connector-odbc-8.0.37-win32.msi"; } @{ download_allways = $false; - name = "mysql-installer-community-8.0.33.0.msi"; - link = "https://cdn.mysql.com/archives/mysql-installer/mysql-installer-community-8.0.33.0.msi"; + name = "mysql-installer-community-8.0.37.0.msi"; + link = "https://cdn.mysql.com/Downloads/MySQLInstaller/mysql-installer-community-8.0.37.0.msi"; } @{ diff --git a/install/win/utils.vbs b/install/win/utils.vbs index 71f1241e21..2261204e95 100644 --- a/install/win/utils.vbs +++ b/install/win/utils.vbs @@ -202,8 +202,8 @@ Function MySQLConfigure If Err.Number <> 0 Then Err.Clear - installDir = shell.RegRead("HKEY_LOCAL_MACHINE\SOFTWARE\WOW6432Node\MySQL AB\MySQL Server 8.0\Location") - dataDir = shell.RegRead("HKEY_LOCAL_MACHINE\SOFTWARE\WOW6432Node\MySQL AB\MySQL Server 8.0\DataLocation") + installDir = shell.RegRead("HKEY_LOCAL_MACHINE\SOFTWARE\MySQL AB\MySQL Server 8.0\Location") + dataDir = shell.RegRead("HKEY_LOCAL_MACHINE\SOFTWARE\MySQL AB\MySQL Server 8.0\DataLocation") End If Call WriteToLog("MySQLConfigure: installDir " & installDir)