Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/phpmyadmin/phpmyadmin.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPiotr Przybylski <piotrprz@gmail.com>2011-08-24 23:40:52 +0400
committerPiotr Przybylski <piotrprz@gmail.com>2011-08-24 23:40:52 +0400
commitf678a45cd2315676f60f28f80f518fa60d8ca3e4 (patch)
treeb873b3a5734dfae29380afb15178aac71991f009 /db_structure.php
parent3e0af184341eca03f24bd75a2b0c3057c8fca327 (diff)
parente13aab10879ecf1af6541d8abd0ff9a1d2154537 (diff)
Merge remote-tracking branch 'origin/master' into drizzle
Conflicts: libraries/database_interface.lib.php
Diffstat (limited to 'db_structure.php')
-rw-r--r--db_structure.php2
1 files changed, 1 insertions, 1 deletions
diff --git a/db_structure.php b/db_structure.php
index d733222555..a7e7a2b31f 100644
--- a/db_structure.php
+++ b/db_structure.php
@@ -453,7 +453,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";