The branch, master has been updated via f1d89536703373c41b888b68414a55ec9642e9ef (commit) via ae8ddbf15bed713ee041ac476c07e44cdd4f6179 (commit) from 485e1736b61773459de8e797d06aac6b16840078 (commit)
- Log ----------------------------------------------------------------- commit f1d89536703373c41b888b68414a55ec9642e9ef Merge: 485e1736b61773459de8e797d06aac6b16840078 ae8ddbf15bed713ee041ac476c07e44cdd4f6179 Author: Marc Delisle marc@infomarc.info Date: Sun Jun 13 08:59:05 2010 -0400
fix conflicts
-----------------------------------------------------------------------
Summary of changes: ChangeLog | 1 + import.php | 9 +++++++++ libraries/import.lib.php | 2 ++ 3 files changed, 12 insertions(+), 0 deletions(-)
diff --git a/ChangeLog b/ChangeLog index 9d5723f..5e55d9c 100644 --- a/ChangeLog +++ b/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, diff --git a/import.php b/import.php index 9498752..4d45a59 100644 --- a/import.php +++ b/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 { diff --git a/libraries/import.lib.php b/libraries/import.lib.php index 85c4cac..2b5d80b 100644 --- a/libraries/import.lib.php +++ b/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();
hooks/post-receive