UPDATE 4.2.9

1 files changed, 14 insertions, 2 deletions

diff --git a/libraries/Table.class.php b/libraries/Table.class.php
index 676127c913..7f8d367dc1 100644
--- a/libraries/Table.class.php
+++ b/libraries/Table.class.php
@@ -1439,8 +1439,20 @@ class PMA_Table
             if (count($index) > 1) {
                 continue;
             }
-            $return[] = ($fullName ? $this->getFullName($backquoted) . '.' : '')
-                . ($backquoted ? PMA_Util::backquote($index[0]) : $index[0]);
+            if ($fullName) {
+                $possible_column = $this->getFullName($backquoted) . '.';
+            } else {
+                $possible_column = '';
+            }
+            if ($backquoted) {
+                $possible_column .= PMA_Util::backquote($index[0]);
+            } else {
+                $possible_column .= $index[0];
+            }
+            // a column might have a primary and an unique index on it
+            if (! in_array($possible_column, $return)) {
+                $return[] = $possible_column;
+            }
         }
 
         return $return;