nettika/phpmyadmin
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

bug #1185152, setting collation for a field

Browse Source
This commit is contained in:
Marc Delisle
2005-05-03 22:50:31 +00:00
parent 179c05acfb
commit 0a136cbfba
2 changed files with 5 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
ChangeLog
View File

@@ -5,6 +5,10 @@ phpMyAdmin - Changelog
$Id$
$Source$
2005-05-03 Marc Delisle <lem9@users.sourceforge.net>
* libraries/common.lib.php: bug #1185152, setting collation for a field,
thanks to Ryan Schmidt - ryandesign
2005-05-02 Marc Delisle <lem9@users.sourceforge.net>
* export.php: bug #1123284, avoid double compression when
zlib.output_compression is On, thanks to unclef at users.sourceforge.net

2
libraries/common.lib.php
View File

@@ -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);
}