From 0a136cbfba2ec2d561ac9027460b5d10820d6285 Mon Sep 17 00:00:00 2001 From: Marc Delisle Date: Tue, 3 May 2005 22:50:31 +0000 Subject: [PATCH] bug #1185152, setting collation for a field --- ChangeLog | 4 ++++ libraries/common.lib.php | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index f130a3b79..2851d33c7 100755 --- a/ChangeLog +++ b/ChangeLog @@ -5,6 +5,10 @@ phpMyAdmin - Changelog $Id$ $Source$ +2005-05-03 Marc Delisle + * libraries/common.lib.php: bug #1185152, setting collation for a field, + thanks to Ryan Schmidt - ryandesign + 2005-05-02 Marc Delisle * export.php: bug #1123284, avoid double compression when zlib.output_compression is On, thanks to unclef at users.sourceforge.net diff --git a/libraries/common.lib.php b/libraries/common.lib.php index 0bb0b025d..f7d72ee04 100644 --- a/libraries/common.lib.php +++ b/libraries/common.lib.php @@ -2536,7 +2536,7 @@ if (typeof(document.getElementById) != 'undefined' $query = PMA_backquote($oldcol) . ' ' . PMA_backquote($newcol) . ' ' . $full_field_type; - if (PMA_MYSQL_INT_VERSION >= 40100 && !empty($collation) && $collation != 'NULL' && preg_match('@^(TINYTEXT|TEXT|MEDIUMTEXT|LONGTEXT|VARCHAR|CHAR)$@i', $full_field_type)) { + if (PMA_MYSQL_INT_VERSION >= 40100 && !empty($collation) && $collation != 'NULL' && preg_match('@^(TINYTEXT|TEXT|MEDIUMTEXT|LONGTEXT|VARCHAR\(\d+\)|CHAR\(\d+\))$@i', $full_field_type)) { $query .= PMA_generateCharsetQueryPart($collation); }