From aff64fa5ee5839d01e5d7a64d04cd3f6a473bd7a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Michal=20=C4=8Ciha=C5=99?= <michal@cihar.com>
Date: Mon, 31 Oct 2005 11:30:29 +0000
Subject: [PATCH] Allow collation change for ENUM and SET columns (bug
 #1343627).

---
 ChangeLog                | 2 ++
 libraries/common.lib.php | 2 +-
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/ChangeLog b/ChangeLog
index 9346ce9ad..fa77f86a4 100755
--- a/ChangeLog
+++ b/ChangeLog
@@ -7,6 +7,8 @@ $Source$
 
 2005-10-31 Michal Čihař  <michal@cihar.com>
     * libraries/select_lang.lib.php: Simplify code.
+    * libraries/common.lib.php: Allow collation change for ENUM and SET
+      columns (bug #1343627).
 
 2005-10-30 Michal Čihař  <michal@cihar.com>
     * lang/slovak: Update, thanks to Ivan Kuriscak - shylauda69.
diff --git a/libraries/common.lib.php b/libraries/common.lib.php
index d3b2d1454..d5bdc7efe 100644
--- a/libraries/common.lib.php
+++ b/libraries/common.lib.php
@@ -2903,7 +2903,7 @@ window.parent.updateTableTitle( '<?php echo $uni_tbl; ?>', '<?php echo PMA_jsFor
             $query .= ' ' . $attribute;
         }
         
-        if (PMA_MYSQL_INT_VERSION >= 40100 && !empty($collation) && $collation != 'NULL' && preg_match('@^(TINYTEXT|TEXT|MEDIUMTEXT|LONGTEXT|VARCHAR|CHAR)$@i', $type)) {
+        if (PMA_MYSQL_INT_VERSION >= 40100 && !empty($collation) && $collation != 'NULL' && preg_match('@^(TINYTEXT|TEXT|MEDIUMTEXT|LONGTEXT|VARCHAR|CHAR|ENUM|SET)$@i', $type)) {
             $query .= PMA_generateCharsetQueryPart($collation);
         }