Merge remote-tracking branch 'origin/QA_4_4' into QA_4_4

ChangeLog

@@ -10,6 +10,7 @@ phpMyAdmin - ChangeLog
 - bug       Missing tooltip in monitor
 - bug       Missing sort icons in monitor
 - bug #4805 Inline edit broken when using functions in query
+- bug #4821 Timed-out import fails to restart when file represented
 
 4.4.0.0 (not yet released)
 + rfe #1553 InnoDB presently supports one FULLTEXT index creation at a time

import.php

@@ -76,6 +76,7 @@ $post_params = array(
     'MAX_FILE_SIZE',
     'message_to_show',
     'noplugin',
+    'skip',
     'skip_queries',
     'local_import_file'
 );
@@ -655,12 +656,19 @@ if (! empty($id_bookmark) && $_REQUEST['action_bookmark'] == 2) {
 
 // Did we hit timeout? Tell it user.
 if ($timeout_passed) {
+    $importUrl = $err_url .= '&timeout_passed=1&offset=' . urlencode($GLOBALS['offset']);
+    if (isset($local_import_file)) {
+        $importUrl .= '&local_import_file=' . urlencode($local_import_file);
+    }
     $message = PMA_Message::error(
         __(
             'Script timeout passed, if you want to finish import,'
-            . ' please resubmit same file and import will resume.'
+            . ' please click %shere%s to resubmit same file and import will resume.'
         )
     );
+    $message->addParam('<a href="' . $importUrl . '">', false);
+    $message->addParam('</a>', false);
+
     if ($offset == 0 || (isset($original_skip) && $original_skip == $offset)) {
         $message->addString(
             __(

libraries/display_import.inc.php

@@ -35,6 +35,16 @@ if (empty($import_list)) {
     exit;
 }
 
+if (PMA_isValid($_REQUEST['offset'], 'numeric')) {
+    $offset = $_REQUEST['offset'];
+}
+if (isset($_REQUEST['timeout_passed'])) {
+    $timeout_passed = $_REQUEST['timeout_passed'];
+}
+if (isset($_REQUEST['local_import_file'])) {
+    $local_import_file = $_REQUEST['local_import_file'];
+}
+
 $timeout_passed_str = isset($timeout_passed)? $timeout_passed : null;
 $offset_str = isset($offset)? $offset : null;
 $html = PMA_getHtmlForImport(

libraries/plugins/import/ImportSql.class.php

@@ -465,16 +465,18 @@ class ImportSql extends ImportPlugin
             );
         }
 
-        //Commit any possible data in buffers
-        PMA_importRunQuery(
-            $this->_stringFctToUse['substr'](
+        if (! $timeout_passed) {
+            //Commit any possible data in buffers
+            PMA_importRunQuery(
+                $this->_stringFctToUse['substr'](
+                    $this->_data,
+                    $this->_queryBeginPosition
+                ), //Query to execute
                 $this->_data,
-                $this->_queryBeginPosition
-            ), //Query to execute
-            $this->_data,
-            false,
-            $sql_data
-        );
+                false,
+                $sql_data
+            );
+        }
         PMA_importRunQuery('', '', false, $sql_data);
     }