Merge #15805 - Fix #15802 - removed SET AUTOCOMMIT=0 from export

Fixes: #15802 Pull-request: #15805 Signed-off-by: William Desportes <williamdes@wdes.fr>
phpmyadmin · Jan 19, 2020 · 187194b · 187194b
2 parents 79d27c8 + ea8da92
commit 187194b
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 3 deletions.
diff --git a/libraries/classes/Plugins/Export/ExportSql.php b/libraries/classes/Plugins/Export/ExportSql.php
@@ -756,8 +756,7 @@ public function exportHeader()
         }
 
         if (isset($GLOBALS['sql_use_transaction'])) {
-            $head .= 'SET AUTOCOMMIT = 0;' . $crlf
-                . 'START TRANSACTION;' . $crlf;
+            $head .= 'START TRANSACTION;' . $crlf;
         }
 
         /* Change timezone if we should export timestamps in UTC */

diff --git a/test/classes/Plugins/Export/ExportSqlTest.php b/test/classes/Plugins/Export/ExportSqlTest.php
@@ -559,7 +559,6 @@ public function testExportHeader()
         $this->assertStringContainsString(
             "SET FOREIGN_KEY_CHECKS=0;\n" .
             "SET SQL_MODE = \"NO_AUTO_VALUE_ON_ZERO\";\n" .
-            "SET AUTOCOMMIT = 0;\n" .
             "START TRANSACTION;\n" .
             "SET time_zone = \"+00:00\";\n",
             $result