AC-11995:Add compatibility with MySQL 8.4 LTS for Magento CE

glo17680 · glo17680 · commit 14d68776de33 · 2024-07-31T17:25:47.000+05:30
diff --git a/lib/internal/Magento/Framework/DB/Adapter/Pdo/Mysql.php b/lib/internal/Magento/Framework/DB/Adapter/Pdo/Mysql.php
@@ -3083,8 +3083,8 @@ public function startSetup()
         $this->rawQuery("SET SQL_MODE=''");
         $this->rawQuery("SET @OLD_FOREIGN_KEY_CHECKS=@@FOREIGN_KEY_CHECKS, FOREIGN_KEY_CHECKS=0");
         $this->rawQuery("SET @OLD_SQL_MODE=@@SQL_MODE, SQL_MODE='NO_AUTO_VALUE_ON_ZERO'");
-        if(str_contains($this->sqlVersionProvider->getSqlVersion(), self::MYSQL_8_4_VERSION)) {
-            $this->rawQuery("SET @@GLOBAL.RESTRICT_FK_ON_NON_STANDARD_KEY=0");
+        if (str_contains($this->sqlVersionProvider->getSqlVersion(), self::MYSQL_8_4_VERSION)) {
+            $this->rawQuery("SET RESTRICT_FK_ON_NON_STANDARD_KEY=0");
         }
         return $this;
     }

Original file line number	Diff line number	Diff line change
`@@ -3083,8 +3083,8 @@ public function startSetup()`
`3083`	`3083`	`$this->rawQuery("SET SQL_MODE=''");`
`3084`	`3084`	`$this->rawQuery("SET @OLD_FOREIGN_KEY_CHECKS=@@FOREIGN_KEY_CHECKS, FOREIGN_KEY_CHECKS=0");`
`3085`	`3085`	`$this->rawQuery("SET @OLD_SQL_MODE=@@SQL_MODE, SQL_MODE='NO_AUTO_VALUE_ON_ZERO'");`
`3086`		`- if(str_contains($this->sqlVersionProvider->getSqlVersion(), self::MYSQL_8_4_VERSION)) {`
`3087`		`- $this->rawQuery("SET @@GLOBAL.RESTRICT_FK_ON_NON_STANDARD_KEY=0");`
	`3086`	`+ if (str_contains($this->sqlVersionProvider->getSqlVersion(), self::MYSQL_8_4_VERSION)) {`
	`3087`	`+ $this->rawQuery("SET RESTRICT_FK_ON_NON_STANDARD_KEY=0");`
`3088`	`3088`	`}`
`3089`	`3089`	`return $this;`
`3090`	`3090`	`}`