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

Allow collation change for ENUM and SET columns (bug #1343627).

Browse Source
This commit is contained in:
Michal Čihař
2005-10-31 11:30:29 +00:00
parent 4e729233fb
commit aff64fa5ee
2 changed files with 3 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
ChangeLog
View File

@@ -7,6 +7,8 @@ $Source$
2005-10-31 Michal Čihař <michal@cihar.com> 2005-10-31 Michal Čihař <michal@cihar.com>
* libraries/select_lang.lib.php: Simplify code. * 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> 2005-10-30 Michal Čihař <michal@cihar.com>
* lang/slovak: Update, thanks to Ivan Kuriscak - shylauda69. * lang/slovak: Update, thanks to Ivan Kuriscak - shylauda69.

2
libraries/common.lib.php
View File

@@ -2903,7 +2903,7 @@ window.parent.updateTableTitle( '<?php echo $uni_tbl; ?>', '<?php echo PMA_jsFor
$query .= ' ' . $attribute; $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); $query .= PMA_generateCharsetQueryPart($collation);
} }