Merge remote-tracking branch 'remotes/api/MAGETWO-50034' into ext-public-pull-requests

Hayder Sharhan · Hayder Sharhan · commit cce311560229 · 2016-03-02T17:04:33.000-06:00
diff --git a/dev/tests/integration/framework/Magento/TestFramework/Db/Mysql.php b/dev/tests/integration/framework/Magento/TestFramework/Db/Mysql.php
@@ -49,7 +49,7 @@ public function cleanup()
     {
         $this->ensureDefaultsExtraFile();
         $this->_shell->execute(
-            'mysql --defaults-extra-file=%s --host=%s %s -e %s',
+            'mysql --defaults-file=%s --host=%s %s -e %s',
             [
                 $this->_defaultsExtraFile,
                 $this->_host,
@@ -86,7 +86,7 @@ public function storeDbDump()
     {
         $this->ensureDefaultsExtraFile();
         $this->_shell->execute(
-            'mysqldump --defaults-extra-file=%s --host=%s  %s > %s',
+            'mysqldump --defaults-file=%s --host=%s  %s > %s',
             [$this->_defaultsExtraFile, $this->_host, $this->_schema, $this->getSetupDbDumpFilename()]
         );
     }
@@ -102,7 +102,7 @@ public function restoreFromDbDump()
             throw new \LogicException("DB dump file does not exist: " . $this->getSetupDbDumpFilename());
         }
         $this->_shell->execute(
-            'mysql --defaults-extra-file=%s --host=%s %s < %s',
+            'mysql --defaults-file=%s --host=%s %s < %s',
             [$this->_defaultsExtraFile, $this->_host, $this->_schema, $this->getSetupDbDumpFilename()]
         );
     }

Original file line number	Diff line number	Diff line change
`@@ -49,7 +49,7 @@ public function cleanup()`
`49`	`49`	`{`
`50`	`50`	`$this->ensureDefaultsExtraFile();`
`51`	`51`	`$this->_shell->execute(`
`52`		`- 'mysql --defaults-extra-file=%s --host=%s %s -e %s',`
	`52`	`+ 'mysql --defaults-file=%s --host=%s %s -e %s',`
`53`	`53`	`[`
`54`	`54`	`$this->_defaultsExtraFile,`
`55`	`55`	`$this->_host,`
`@@ -86,7 +86,7 @@ public function storeDbDump()`
`86`	`86`	`{`
`87`	`87`	`$this->ensureDefaultsExtraFile();`
`88`	`88`	`$this->_shell->execute(`
`89`		`- 'mysqldump --defaults-extra-file=%s --host=%s %s > %s',`
	`89`	`+ 'mysqldump --defaults-file=%s --host=%s %s > %s',`
`90`	`90`	`[$this->_defaultsExtraFile, $this->_host, $this->_schema, $this->getSetupDbDumpFilename()]`
`91`	`91`	`);`
`92`	`92`	`}`
`@@ -102,7 +102,7 @@ public function restoreFromDbDump()`
`102`	`102`	`throw new \LogicException("DB dump file does not exist: " . $this->getSetupDbDumpFilename());`
`103`	`103`	`}`
`104`	`104`	`$this->_shell->execute(`
`105`		`- 'mysql --defaults-extra-file=%s --host=%s %s < %s',`
	`105`	`+ 'mysql --defaults-file=%s --host=%s %s < %s',`
`106`	`106`	`[$this->_defaultsExtraFile, $this->_host, $this->_schema, $this->getSetupDbDumpFilename()]`
`107`	`107`	`);`
`108`	`108`	`}`