bug #3463933 [display] SELECT DISTINCT displays wrong total records found

This commit is contained in:
Marc Delisle
2011-12-28 08:40:31 -05:00
parent cd294e5b97
commit f7a9d2a36a
2 changed files with 2 additions and 0 deletions

View File

@@ -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

View File

@@ -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 ')