From 5adf2fb35275ddcb4f64be39d4387928b931af89 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Michal=20=C4=8Ciha=C5=99?= <mcihar@suse.cz>
Date: Thu, 4 Aug 2011 16:21:47 +0200
Subject: [PATCH] Processing of varbinary fields

---
 libraries/common.lib.php                            |  2 ++
 test/libraries/common/PMA_extractFieldSpec_test.php | 12 ++++++++++++
 2 files changed, 14 insertions(+)

diff --git a/libraries/common.lib.php b/libraries/common.lib.php
index 559d24b2a5..d56612801c 100644
--- a/libraries/common.lib.php
+++ b/libraries/common.lib.php
@@ -2639,6 +2639,8 @@ function PMA_extractFieldSpec($fieldspec) {
         if (!preg_match('@binary[\(]@', $shorttype)) {
             $binary = strpos($shorttype, 'blob') !== false || strpos($shorttype, 'binary') !== false;
             $shorttype = preg_replace('@binary@', '', $shorttype);
+        } else {
+            $binary = false;
         }
         $shorttype = preg_replace('@zerofill@', '', $shorttype, -1, $zerofill_cnt);
         $zerofill = ($zerofill_cnt > 0);
diff --git a/test/libraries/common/PMA_extractFieldSpec_test.php b/test/libraries/common/PMA_extractFieldSpec_test.php
index 2413e57f32..dc3c90d547 100644
--- a/test/libraries/common/PMA_extractFieldSpec_test.php
+++ b/test/libraries/common/PMA_extractFieldSpec_test.php
@@ -75,6 +75,18 @@ class PMA_extractFieldSpec_test extends PHPUnit_Extensions_OutputTestCase
                     'enum_set_values' => array(),
                     ),
                 ),
+            array(
+                "VARBINARY(255)",
+                array(
+                    'type' => 'varbinary',
+                    'short_type' => 'varbinary(255)',
+                    'binary' => false,
+                    'unsigned' => false,
+                    'zerofill' => false,
+                    'spec_in_brackets' => '255',
+                    'enum_set_values' => array(),
+                    ),
+                ),
             );
     }
 }