fix conflicts

ChangeLog

@@ -100,6 +100,7 @@ $Id$
 - patch #3013264 [doc] FAQ 1.40 uses a comma instead of a period,
   thanks to Isaac Bennetch - ibennetch
 - [engines] Fix getting InnoDB status.
+- bug #2986422 [import] Results for query are not displayed
 
 3.3.3.0 (2010-05-10)
 - patch #2982480 [navi] Do not group if there would be one table in group,

import.php

@@ -447,6 +447,15 @@ if (isset($my_die)) {
     }
 }
 
+// we want to see the results of the last query that returned at least a row
+if (! empty($last_query_with_results)) {
+    // but we want to show intermediate results too
+    $disp_query = $sql_query;
+    $disp_message = __('Your SQL query has been executed successfully'); 
+    $sql_query = $last_query_with_results;
+    $go_sql = true;
+}
+
 if ($go_sql) {
     require './sql.php';
 } else {

libraries/import.lib.php

@@ -84,6 +84,7 @@ function PMA_importRunQuery($sql = '', $full = '', $controluser = false)
 {
     global $import_run_buffer, $go_sql, $complete_query, $display_query,
         $sql_query, $my_die, $error, $reload,
+        $last_query_with_results,
         $skip_queries, $executed_queries, $max_sql_len, $read_multiply,
         $cfg, $sql_query_disabled, $db, $run_query, $is_superuser;
     $read_multiply = 1;
@@ -143,6 +144,7 @@ function PMA_importRunQuery($sql = '', $full = '', $controluser = false)
                             $a_aff_rows = (int)@PMA_DBI_affected_rows();
                             if ($a_num_rows > 0) {
                                 $msg .= __('Rows'). ': ' . $a_num_rows;
+                                $last_query_with_results = $import_run_buffer['sql'];
                             } elseif ($a_aff_rows > 0) {
                                 $message = PMA_Message::affected_rows($a_aff_rows);
                                 $msg .= $message->getMessage();