Merge branch 'QA_4_6'

ChangeLog

@@ -24,6 +24,7 @@ phpMyAdmin - ChangeLog
 - issue #12229 Avoid storing objects in session when debugging SQL
 - issue #12249 Fix cookie path on IIS
 - issue #11705 Fix occassional 200 errors on Windows
+- issue #12219 Fix locking issues when importing SQL
 
 4.6.1 (2016-05-02)
 - issue #12120 PMA_Util not found in insert_edit.lib.php

libraries/common.inc.php

@@ -829,7 +829,15 @@ if (! defined('PMA_MINIMUM_COMMON')) {
         }
 
         if (! $controllink) {
-            $controllink = $userlink;
+            /*
+             * Open separate connection for control queries, this is needed
+             * to avoid problems with table locking used in main connection
+             * and phpMyAdmin issuing queries to configuration storage, which
+             * is not locked by that time.
+             */
+            $controllink = $GLOBALS['dbi']->connect(
+                $cfg['Server']['user'], $cfg['Server']['password'], false
+            );
         }
 
         $auth_plugin->storeUserCredentials();