From c7808fe151e85116d87fdf9018a715a89c05883e Mon Sep 17 00:00:00 2001
From: "Alexander M. Turek" <me@derrabus.de>
Date: Sun, 5 Sep 2004 15:02:52 +0000
Subject: [PATCH] Don't offer the BINARY field attribute in MySQL 4.1.

---
 ChangeLog              | 2 ++
 tbl_properties.inc.php | 5 ++++-
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/ChangeLog b/ChangeLog
index 765d0a616..699d8e6dd 100755
--- a/ChangeLog
+++ b/ChangeLog
@@ -8,6 +8,8 @@ $Source$
 2004-09-05 Alexander M. Turek  <me@derrabus.de>
     * libraries/sqlparser.data.php: Parser support for SHOW STORAGE ENGINES.
     * 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>
     * Documentation.html: Add information about theme versions and names.
diff --git a/tbl_properties.inc.php b/tbl_properties.inc.php
index a4a742209..6ae7f597b 100644
--- a/tbl_properties.inc.php
+++ b/tbl_properties.inc.php
@@ -280,7 +280,7 @@ for ($i = 0 ; $i < $num_fields; $i++) {
         $unsigned         = 0;
         $zerofill         = 0;
     } 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');
         } else {
             $binary           = FALSE;
@@ -315,6 +315,9 @@ for ($i = 0 ; $i < $num_fields; $i++) {
 
     $cnt_attribute_types = count($cfg['AttributeTypes']);
     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] . '"';
         if (strtoupper($strAttribute) == strtoupper($cfg['AttributeTypes'][$j])) {
             $content_cells[$i][$ci] .= ' selected="selected"';