The branch, QA_3_4 has been updated
via f7a9d2a36a5cedd0b380e8ca89de856a44da1874 (commit)
from cd294e5b97c723fa85e29d2b2c43eaa48e60c60a (commit)
- Log -----------------------------------------------------------------
-----------------------------------------------------------------------
Summary of changes:
ChangeLog | 1 +
sql.php | 1 +
2 files changed, 2 insertions(+), 0 deletions(-)
diff --git a/ChangeLog b/ChangeLog
index 8cbd325..578bed5 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -5,6 +5,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 6b2628a..e22a32d 100644
--- a/sql.php
+++ b/sql.php
@@ -494,6 +494,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 ')
hooks/post-receive
--
phpMyAdmin
------------------------------------------------------------------------------
Write once. Port to many.
Get the SDK and tools to simplify cross-platform app development. Create
new or port existing apps to sell to consumers worldwide. Explore the
Intel AppUpSM program developer opportunity. appdeveloper.intel.com/join
http://p.sf.net/sfu/intel-appdev
_______________________________________________
Phpmyadmin-git mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/phpmyadmin-git
