From 570dc223e8325fe11a5a9f3b2d3f05f9f25be32b Mon Sep 17 00:00:00 2001
From: Nasrullo Nurullaev <61620246+nasrullonurullaev@users.noreply.github.com>
Date: Fri, 7 Jun 2024 18:38:39 +0500
Subject: [PATCH 1/2] fix Bug 68348 - Update MySQL to 8.0.37 (#253)
---
install/win/DocSpace.aip | 11 ++++++-----
install/win/build-download-prereq.ps1 | 8 ++++----
2 files changed, 10 insertions(+), 9 deletions(-)
diff --git a/install/win/DocSpace.aip b/install/win/DocSpace.aip
index dddf1b56b4..3f608c14c8 100644
--- a/install/win/DocSpace.aip
+++ b/install/win/DocSpace.aip
@@ -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";
}
@{
From 000a444f44dbf694cf31c2087995519c0a9c5faa Mon Sep 17 00:00:00 2001
From: Nasrullo Nurullaev
Date: Sat, 8 Jun 2024 12:21:12 +0500
Subject: [PATCH 2/2] Switched custom action from 32 to 64-bit execution
---
install/win/DocSpace.aip | 2 +-
install/win/utils.vbs | 4 ++--
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/install/win/DocSpace.aip b/install/win/DocSpace.aip
index 3f608c14c8..96b57413d0 100644
--- a/install/win/DocSpace.aip
+++ b/install/win/DocSpace.aip
@@ -1032,7 +1032,7 @@
-
+
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)