[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_4_5-20512-gabe9351

[Madhura Jayaratne]

The branch, master has been updated
       via  abe93510a28dd5286518d80f6ca9c4bd7c9b7983 (commit)
       via  55d1360b7e724ed2b3f9542024d3e8291ffcf7f5 (commit)
      from  e96b059dfa66a3a3287405b5e4f9d9e54d9b8e15 (commit)


- Log -----------------------------------------------------------------
commit abe93510a28dd5286518d80f6ca9c4bd7c9b7983
Merge: e96b059 55d1360
Author: Madhura Jayaratne <madhura.cj at gmail.com>
Date:   Thu Sep 29 21:17:26 2011 +0530

    Merge branch 'QA_3_4'

-----------------------------------------------------------------------

Summary of changes:
 sql.php |    1 +
 1 files changed, 1 insertions(+), 0 deletions(-)

diff --git a/sql.php b/sql.php
index e941b7c..96fc6b5 100644
--- a/sql.php
+++ b/sql.php
@@ -482,6 +482,7 @@ if (strlen($db)) {
 if (isset($GLOBALS['show_as_php']) || ! empty($GLOBALS['validatequery'])) {
     unset($result);
     $num_rows = 0;
+    $unlim_num_rows = 0;
 } else {
     if (isset($_SESSION['profiling']) && PMA_profilingSupported()) {
         PMA_DBI_query('SET PROFILING=1;');


hooks/post-receive
-- 
phpMyAdmin