Skip to content

Commit 0b95462

Browse files
committed
AC-12085:: Add compatibility with MariaDB 11.4 LTS For CE
1 parent 5ad4f56 commit 0b95462

File tree

1 file changed

+12
-2
lines changed
  • dev/tests/integration/framework/Magento/TestFramework/Db

1 file changed

+12
-2
lines changed

dev/tests/integration/framework/Magento/TestFramework/Db/Mysql.php

Lines changed: 12 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -176,7 +176,7 @@ public function restoreFromDbDump()
176176
throw new \LogicException("DB dump file does not exist: " . $this->getSetupDbDumpFilename());
177177
}
178178

179-
$dbCommand = $this->getDbCommand();
179+
$dbCommand = $this->getDbImportCommand();
180180

181181
$this->_shell->execute(
182182
"{$dbCommand} --defaults-file=%s --host=%s --port=%s %s < %s",
@@ -297,7 +297,7 @@ private function isMariaDB(): bool
297297
*/
298298
protected function getDbCommand()
299299
{
300-
return $this->isMariaDB() ? 'mariadb-import' : 'mysql';
300+
return $this->isMariaDB() ? 'mariadb' : 'mysql';
301301
}
302302

303303
/**
@@ -309,4 +309,14 @@ protected function getDbDumpCommand()
309309
{
310310
return $this->isMariaDB() ? 'mariadb-dump' : 'mysqldump';
311311
}
312+
313+
/**
314+
* Get db command mysql or mariadb-import
315+
*
316+
* @return string
317+
*/
318+
protected function getDbImportCommand()
319+
{
320+
return $this->isMariaDB() ? 'mariadb-import' : 'mysql';
321+
}
312322
}

0 commit comments

Comments
 (0)