Use PMA_DBI_get_table_indexes_sql() only when really needed, in all other cases use PMA_DBI_get_table_indexes()

1 files changed, 2 insertions, 6 deletions

diff --git a/db_datadict.php b/db_datadict.php
index 538bccd427..f580e21e5a 100644
--- a/db_datadict.php
+++ b/db_datadict.php
@@ -76,7 +76,7 @@ foreach($tables as $table) {
      */
 
     PMA_DBI_select_db($db);
-    $result       = PMA_DBI_query(PMA_DBI_get_table_indexes_sql($db, $table));
+    $indexes      = PMA_DBI_get_table_indexes($db, $table);
     $primary      = '';
     $indexes      = array();
     $lastIndex    = '';
@@ -84,7 +84,7 @@ foreach($tables as $table) {
     $indexes_data = array();
     $pk_array     = array(); // will be use to emphasis prim. keys in the table
                              // view
-    while ($row = PMA_DBI_fetch_assoc($result)) {
+    foreach ($indexes as $row) {
         // Backups the list of primary keys
         if ($row['Key_name'] == 'PRIMARY') {
             $primary   .= $row['Column_name'] . ', ';
@@ -111,10 +111,6 @@ foreach($tables as $table) {
         }
 
     } // end while
-    if ($result) {
-        PMA_DBI_free_result($result);
-    }
-
 
     /**
      * Gets columns properties