Skip to content

Commit 7498e5c

Browse files
authored
Merge pull request #9670 from magento-gl/AC-14090_v1
AC-14090:: Integration Failing with PHP8.4 and MYSQL 8.4
2 parents 5223b10 + e4057c4 commit 7498e5c

File tree

2 files changed

+1
-5
lines changed
  • dev/tests/integration/testsuite/Magento/Framework/DB/Adapter/Pdo
  • lib/internal/Magento/Framework/DB/Adapter/Pdo

2 files changed

+1
-5
lines changed

dev/tests/integration/testsuite/Magento/Framework/DB/Adapter/Pdo/MysqlTest.php

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -75,11 +75,6 @@ public function testWaitTimeout()
7575

7676
// Sleep for time greater than wait_timeout and try to perform query
7777
sleep($minWaitTimeout + 1);
78-
79-
// Reconnect to the database to ensure the connection is valid
80-
$this->getDbAdapter()->closeConnection();
81-
$this->getDbAdapter()->getConnection(); // Reconnect
82-
8378
$result = $this->executeQuery('SELECT 1');
8479
$this->assertInstanceOf(\Magento\Framework\DB\Statement\Pdo\Mysql::class, $result);
8580
} finally {

lib/internal/Magento/Framework/DB/Adapter/Pdo/Mysql.php

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -658,6 +658,7 @@ private function performQuery(callable $queryExecutor)
658658
$connectionErrors = [
659659
2006, // SQLSTATE[HY000]: General error: 2006 MySQL server has gone away
660660
2013, // SQLSTATE[HY000]: General error: 2013 Lost connection to MySQL server during query
661+
4031, // SQLSTATE[HY000]: General error: 4031 The client was disconnected by server because of inactivity.
661662
];
662663
$triesCount = 0;
663664
do {

0 commit comments

Comments
 (0)