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

Don't offer the BINARY field attribute in MySQL 4.1.

Browse Source
This commit is contained in:
Alexander M. Turek
2004-09-05 15:02:52 +00:00
parent 72e5226597
commit c7808fe151
2 changed files with 6 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
ChangeLog
View File

@@ -8,6 +8,8 @@ $Source$
2004-09-05 Alexander M. Turek <me@derrabus.de> 2004-09-05 Alexander M. Turek <me@derrabus.de>
* libraries/sqlparser.data.php: Parser support for SHOW STORAGE ENGINES. * libraries/sqlparser.data.php: Parser support for SHOW STORAGE ENGINES.
* tbl_create.php: Use default tab. * tbl_create.php: Use default tab.
* tbl_properties.inc.php: Don't offer the BINARY field attribute in
MySQL 4.1.
2004-09-05 Michal Čihař <michal@cihar.com> 2004-09-05 Michal Čihař <michal@cihar.com>
* Documentation.html: Add information about theme versions and names. * Documentation.html: Add information about theme versions and names.

5
tbl_properties.inc.php
View File

@@ -280,7 +280,7 @@ for ($i = 0 ; $i < $num_fields; $i++) {
$unsigned = 0; $unsigned = 0;
$zerofill = 0; $zerofill = 0;
} else { } else {
if (!preg_match('@BINARY[\(]@i', $row['Type'])) { if (!preg_match('@BINARY[\(]@i', $row['Type']) && PMA_MYSQL_INT_VERSION < 40100) {
$binary = stristr($row['Type'], 'binary'); $binary = stristr($row['Type'], 'binary');
} else { } else {
$binary = FALSE; $binary = FALSE;
@@ -315,6 +315,9 @@ for ($i = 0 ; $i < $num_fields; $i++) {
$cnt_attribute_types = count($cfg['AttributeTypes']); $cnt_attribute_types = count($cfg['AttributeTypes']);
for ($j = 0;$j < $cnt_attribute_types; $j++) { for ($j = 0;$j < $cnt_attribute_types; $j++) {
if (PMA_MYSQL_INT_VERSION >= 40100 && $cfg['AttributeTypes'][$j] == 'BINARY') {
continue;
}
$content_cells[$i][$ci] .= ' <option value="'. $cfg['AttributeTypes'][$j] . '"'; $content_cells[$i][$ci] .= ' <option value="'. $cfg['AttributeTypes'][$j] . '"';
if (strtoupper($strAttribute) == strtoupper($cfg['AttributeTypes'][$j])) { if (strtoupper($strAttribute) == strtoupper($cfg['AttributeTypes'][$j])) {
$content_cells[$i][$ci] .= ' selected="selected"'; $content_cells[$i][$ci] .= ' selected="selected"';