From fac9071975423e84d4336ad06b10f5fdb6f346ab Mon Sep 17 00:00:00 2001
From: Marc Delisle <marc@infomarc.info>
Date: Tue, 28 Jun 2005 11:00:38 +0000
Subject: [PATCH] bug 1225635, cannot change table's collation under MySQL
 5.0.4

---
 ChangeLog                     | 4 ++++
 tbl_properties_operations.php | 4 ++++
 2 files changed, 8 insertions(+)

diff --git a/ChangeLog b/ChangeLog
index d581b1b66..437718a56 100755
--- a/ChangeLog
+++ b/ChangeLog
@@ -5,6 +5,10 @@ phpMyAdmin - Changelog
 $Id$
 $Source$
 
+2005-06-28 Marc Delisle  <lem9@users.sourceforge.net>
+    * tbl_properties_operations.php: bug #1225635,
+      cannot change table's collation under MySQL 5.0.4
+
 2005-06-27 Michal Čihař  <michal@cihar.com>
     * config.inc.php: Better comments describing multi server setup (patch
       #1226666).
diff --git a/tbl_properties_operations.php b/tbl_properties_operations.php
index 9a6b6ed45..428050496 100644
--- a/tbl_properties_operations.php
+++ b/tbl_properties_operations.php
@@ -42,6 +42,10 @@ if (isset($submittype)) {
     $message       = $strSuccess;
 }
 if (isset($submitcollation)) {
+    // since something modifies $tbl_collation between the moment it is
+    // set from $_POST and this point, need to restore it
+    // (bug seen in MySQL 5.0.4)
+    $tbl_collation = $_POST['tbl_collation'];
     $sql_query     = 'ALTER TABLE ' . PMA_backquote($table) . ' DEFAULT' . PMA_generateCharsetQueryPart($tbl_collation);
     $result        = PMA_DBI_query($sql_query);
     $message       = $strSuccess;