From da6c5b71294892dda8da09ce8886ce35abf48a78 Mon Sep 17 00:00:00 2001
From: Piotr Przybylski <piotrprz@gmail.com>
Date: Tue, 23 Aug 2011 22:19:21 +0200
Subject: [PATCH] Inline PMA_DBI_get_default_engine(), this one-liner is used
 only once

---
 db_structure.php                     |  2 +-
 libraries/database_interface.lib.php | 10 ----------
 2 files changed, 1 insertion(+), 11 deletions(-)

diff --git a/db_structure.php b/db_structure.php
index 9c2e045755..c0c1d33ec8 100644
--- a/db_structure.php
+++ b/db_structure.php
@@ -444,7 +444,7 @@ if ($is_show_stats) {
     <th class="value tbl_rows"><?php echo $sum_row_count_pre . PMA_formatNumber($sum_entries, 0); ?></th>
 <?php
 if (!($cfg['PropertiesNumColumns'] > 1)) {
-    $default_engine = PMA_DBI_get_default_engine();
+    $default_engine = PMA_DBI_fetch_value('SHOW VARIABLES LIKE \'storage_engine\';', 0, 1);
     echo '    <th align="center">' . "\n"
        . '        <dfn title="'
        . sprintf(__('%s is the default storage engine on this MySQL server.'), $default_engine) . '">' .$default_engine . '</dfn></th>' . "\n";
diff --git a/libraries/database_interface.lib.php b/libraries/database_interface.lib.php
index 58307fea39..3db1b498a4 100644
--- a/libraries/database_interface.lib.php
+++ b/libraries/database_interface.lib.php
@@ -1175,16 +1175,6 @@ function PMA_DBI_fetch_result($result, $key = null, $value = null,
 }
 
 /**
- * return default table engine for given database
- *
- * @return  string  default table engine
- */
-function PMA_DBI_get_default_engine()
-{
-    return PMA_DBI_fetch_value('SHOW VARIABLES LIKE \'storage_engine\';', 0, 1);
-}
-
-/**
  * Get supported SQL compatibility modes
  *
  * @return  array   supported SQL compatibility modes
-- 
2.11.4.GIT