[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_4_3_2-16992-gda6c5b7

The branch, master has been updated via da6c5b71294892dda8da09ce8886ce35abf48a78 (commit) from cae0366d212bef81d3cef345b02c3e00f681602d (commit) - Log ----------------------------------------------------------------- commit da6c5b71294892dda8da09ce8886ce35abf48a78 Author: Piotr Przybylski <piotrprz@gmail.com> Date: Tue Aug 23 22:19:21 2011 +0200 Inline PMA_DBI_get_default_engine(), this one-liner is used only once ----------------------------------------------------------------------- Summary of changes: db_structure.php | 2 +- libraries/database_interface.lib.php | 10 ---------- 2 files changed, 1 insertions(+), 11 deletions(-) diff --git a/db_structure.php b/db_structure.php index 9c2e045..c0c1d33 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 58307fe..3db1b49 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 hooks/post-receive -- phpMyAdmin
participants (1)
-
Piotr Przybylski