From dc649ba0564e848636563fc8453d30ac648310ae Mon Sep 17 00:00:00 2001
From: Marc Delisle <marc@infomarc.info>
Date: Wed, 21 Dec 2005 19:56:49 +0000
Subject: [PATCH] bug #1349262, use Storage Engine

---
 ChangeLog                        | 3 +++
 libraries/tbl_properties.inc.php | 3 ++-
 tbl_properties_operations.php    | 6 +++---
 3 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 25c0658bc..519a4ddfc 100755
--- a/ChangeLog
+++ b/ChangeLog
@@ -8,6 +8,9 @@ $Source$
 2005-12-21 Marc Delisle  <lem9@users.sourceforge.net>
     * lang/danish: Updated, thanks to AlleyKat - dk_alleykat
     * lang/hungarian update, thanks to Mihály Mészáros <necronix@freemail.hu>
+    * tbl_properties_operations.php, libraries/tbl_properties.inc.php:
+      bug #1349262, mismatch between PMA and MySQL about Storage Engine
+      and table type
 
 2005-12-20 Marc Delisle  <lem9@users.sourceforge.net>
     * libraries/common.lib.php: does not return to correct page after
diff --git a/libraries/tbl_properties.inc.php b/libraries/tbl_properties.inc.php
index 0466a54f5..0c36231db 100644
--- a/libraries/tbl_properties.inc.php
+++ b/libraries/tbl_properties.inc.php
@@ -638,7 +638,8 @@ if ($action == 'tbl_create.php') {
     <tr valign="top">
         <th><?php echo $strTableComments; ?>:&nbsp;</th>
         <td width="25">&nbsp;</td>
-        <th><?php echo $strTableType; ?>:&nbsp;</th>
+    <th><?php echo $strStorageEngine; ?>:&nbsp;<?php echo PMA_showMySQLDocu('Storage_engines', 'Storage_engines'); ?>
+        </th>
     <?php
     if ( PMA_MYSQL_INT_VERSION >= 40100 ) {
         echo '        <td width="25">&nbsp;</td>' . "\n"
diff --git a/tbl_properties_operations.php b/tbl_properties_operations.php
index 9c7daf3cb..74ec9af92 100644
--- a/tbl_properties_operations.php
+++ b/tbl_properties_operations.php
@@ -251,9 +251,9 @@ if (strstr($show_comment, '; InnoDB free') === false) {
         </td>
     </tr>
 
-    <!-- Table type -->
-    <tr><td><?php echo $strTableType; ?>
-            <?php echo PMA_showMySQLDocu('Table_types', 'Table_types'); ?>
+    <!-- Storage engine -->
+    <tr><td><?php echo $strStorageEngine; ?>
+            <?php echo PMA_showMySQLDocu('Storage_engines', 'Storage_engines'); ?>
         </td>
         <td><?php echo PMA_generateEnginesDropdown('new_tbl_type', null, false, $tbl_type, 4); ?>
         </td>