Skip to content

Commit d8a18b8

Browse files
committed
AC-12085:: Add compatibility with MariaDB 11.4 LTS For CE
1 parent 76edad6 commit d8a18b8

File tree

1 file changed

+4
-6
lines changed
  • dev/tests/integration/framework/Magento/TestFramework/Db

1 file changed

+4
-6
lines changed

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

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -96,9 +96,8 @@ public function cleanup()
9696

9797
$this->ensureDefaultsExtraFile();
9898
$this->_shell->execute(
99-
'%s --defaults-file=%s --host=%s --port=%s %s -e %s',
99+
"`{$dbCommand}` --defaults-file=%s --host=%s --port=%s %s -e %s",
100100
[
101-
$dbCommand,
102101
$this->_defaultsExtraFile,
103102
$this->_host,
104103
$this->_port,
@@ -147,7 +146,7 @@ public function storeDbDump()
147146

148147
$format = sprintf(
149148
'%s %s %s %s',
150-
'%s --defaults-file=%s --host=%s --port=%s',
149+
"`{$dumpCommand}` --defaults-file=%s --host=%s --port=%s",
151150
'--no-tablespaces',
152151
implode(' ', $additionalArguments),
153152
'%s > %s'
@@ -156,7 +155,6 @@ public function storeDbDump()
156155
$this->_shell->execute(
157156
$format,
158157
[
159-
$dumpCommand,
160158
$this->_defaultsExtraFile,
161159
$this->_host,
162160
$this->_port,
@@ -181,8 +179,8 @@ public function restoreFromDbDump()
181179
$dbCommand = $this->getDbCommand();
182180

183181
$this->_shell->execute(
184-
'%s --defaults-file=%s --host=%s --port=%s %s < %s',
185-
[$dbCommand, $this->_defaultsExtraFile, $this->_host, $this->_port,
182+
"`{$dbCommand}` --defaults-file=%s --host=%s --port=%s %s < %s",
183+
[$this->_defaultsExtraFile, $this->_host, $this->_port,
186184
$this->_schema, $this->getSetupDbDumpFilename()]
187185
);
188186
}

0 commit comments

Comments
 (0)