From a9678242fc16bf117c7b56970e508bc4630dcaa6 Mon Sep 17 00:00:00 2001
From: Marc Delisle <marc@infomarc.info>
Date: Tue, 24 May 2005 10:57:22 +0000
Subject: [PATCH] bug #1207212, changing table type under MySQL 5.0.4

---
 ChangeLog                     | 2 ++
 tbl_properties_operations.php | 5 ++---
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index cb2109a93..def4ce684 100755
--- a/ChangeLog
+++ b/ChangeLog
@@ -8,6 +8,8 @@ $Source$
 2005-05-24 Marc Delisle  <lem9@users.sourceforge.net>
     * libraries/common.lib.php: bug #1207395, undefined theme_generation
       and theme_version, thanks to Ryan Schmidt
+    * tbl_properties_operations.php: bug #1207212, changing table type
+      under MySQL 5.0.4
 
 2005-05-22 Marc Delisle  <lem9@users.sourceforge.net>
     * libraries/charset_conversion.lib.php: diacritics wrongly converted 
diff --git a/tbl_properties_operations.php b/tbl_properties_operations.php
index 3742e5337..9a6b6ed45 100644
--- a/tbl_properties_operations.php
+++ b/tbl_properties_operations.php
@@ -2,7 +2,6 @@
 /* $Id$ */
 // vim: expandtab sw=4 ts=4 sts=4:
 
-
 /**
  * Runs common work
  */
@@ -38,7 +37,7 @@ if (isset($submitcomment)) {
     }
 }
 if (isset($submittype)) {
-    $sql_query     = 'ALTER TABLE ' . PMA_backquote($table) . ' TYPE = ' . $tbl_type;
+    $sql_query     = 'ALTER TABLE ' . PMA_backquote($table) . ' TYPE = ' . $new_tbl_type;
     $result        = PMA_DBI_query($sql_query);
     $message       = $strSuccess;
 }
@@ -325,7 +324,7 @@ for ($i = 0; $i < $num_dbs; $i++) {
         </tr>
         <tr>
             <td bgcolor="<?php echo $cfg['BgcolorOne']; ?>">
-	        <?php echo PMA_generateEnginesDropdown('tbl_type', NULL, FALSE, $tbl_type, 4); ?>
+	        <?php echo PMA_generateEnginesDropdown('new_tbl_type', NULL, FALSE, $tbl_type, 4); ?>
             </td>
             <td bgcolor="<?php echo $cfg['BgcolorOne']; ?>" align="right">
                 <input type="submit" name="submittype" value="<?php echo $strGo; ?>" />