[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_4_9-25666-g554a551

[Marc Delisle]

The branch, master has been updated
       via  554a55134d7b5655f63277554f0c5a9f0a3a1e03 (commit)
       via  f7a9d2a36a5cedd0b380e8ca89de856a44da1874 (commit)
      from  d52db4be6a5915f07b7e633dbb2ee48546f1c61f (commit)


- Log -----------------------------------------------------------------
commit 554a55134d7b5655f63277554f0c5a9f0a3a1e03
Merge: d52db4b f7a9d2a
Author: Marc Delisle <marc at infomarc.info>
Date:   Wed Dec 28 08:44:04 2011 -0500

    Fix merge conflicts

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

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

diff --git a/ChangeLog b/ChangeLog
index b5e712a..7713f7b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -71,6 +71,7 @@ phpMyAdmin - ChangeLog
 - bug #3460090 [interface] TextareaAutoSelect feature broken
 - patch #3375984 [export] PHP Array export might generate invalid php code
 - bug #3049209 [import] Import from ODS ignores cell that is the same as cell before
+- bug #3463933 [display] SELECT DISTINCT displays wrong total records found
 
 3.4.9.0 (2011-12-21)
 - bug #3442028 [edit] Inline editing enum fields with null shows no dropdown
diff --git a/sql.php b/sql.php
index 4f30ba5..4252efd 100644
--- a/sql.php
+++ b/sql.php
@@ -592,6 +592,7 @@ if (isset($GLOBALS['show_as_php']) || ! empty($GLOBALS['validatequery'])) {
 
         if (! $is_group
             && ! isset($analyzed_sql[0]['queryflags']['union'])
+            && ! isset($analyzed_sql[0]['queryflags']['distinct'])
             && ! isset($analyzed_sql[0]['table_ref'][1]['table_name'])
             && (empty($analyzed_sql[0]['where_clause']) || $analyzed_sql[0]['where_clause'] == '1 ')
             && ! isset($find_real_end)


hooks/post-receive
-- 
phpMyAdmin