From 6171c6c8bde9bf20b466793c712d51c1fce93ff1 Mon Sep 17 00:00:00 2001
From: Madhura Jayaratne <madhura.cj@gmail.com>
Date: Tue, 27 Jan 2015 14:24:49 +0530
Subject: [PATCH] bug #4734 Default values for binary fields do not support
 binary values

Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
---
 ChangeLog                                     | 1 +
 libraries/Table.class.php                     | 2 ++
 libraries/insert_edit.lib.php                 | 2 ++
 libraries/tbl_columns_definition_form.lib.php | 6 +++---
 4 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 5dbde3c7f6..5a3ee5443f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -5,6 +5,7 @@ phpMyAdmin - ChangeLog
 - bug #4728 Incorrect headings in routine editor
 - bug #4730 Notice while browsing tables when phpmyadmin pma database exists, but not all the tables
 - bug #4729 Display original field when using "Relational display column" option and display column is empty
+- bug #4734 Default values for binary fields do not support binary values
 
 4.3.8.0 (2015-01-24)
 - bug       Undefined constant PMA_DRIZZLE
diff --git a/libraries/Table.class.php b/libraries/Table.class.php
index 338420d7d4..7d13496462 100644
--- a/libraries/Table.class.php
+++ b/libraries/Table.class.php
@@ -493,6 +493,8 @@ class PMA_Table
                     $query .= ' DEFAULT \''
                         . PMA_Util::sqlAddSlashes($default_value) . '\'';
                 }
+            } elseif ($type == 'BINARY' || $type == 'VARBINARY') {
+                $query .= ' DEFAULT 0x' . $default_value;
             } else {
                 $query .= ' DEFAULT \''
                     . PMA_Util::sqlAddSlashes($default_value) . '\'';
diff --git a/libraries/insert_edit.lib.php b/libraries/insert_edit.lib.php
index 706d1c11cd..8a220ddd01 100644
--- a/libraries/insert_edit.lib.php
+++ b/libraries/insert_edit.lib.php
@@ -1712,6 +1712,8 @@ function PMA_getSpecialCharsAndBackupFieldForInsertingMode(
         || $trueType == 'time'
     ) {
         $special_chars = PMA_Util::addMicroseconds($column['Default']);
+    } elseif ($trueType == 'binary' || $trueType == 'varbinary') {
+        $special_chars = bin2hex($column['Default']);
     } else {
         $special_chars = htmlspecialchars($column['Default']);
     }
diff --git a/libraries/tbl_columns_definition_form.lib.php b/libraries/tbl_columns_definition_form.lib.php
index ea437a0bc1..3cb00440d4 100644
--- a/libraries/tbl_columns_definition_form.lib.php
+++ b/libraries/tbl_columns_definition_form.lib.php
@@ -1120,11 +1120,11 @@ function PMA_getHtmlForColumnDefault($columnNumber, $ci, $ci_offset, $type_upper
         && isset($columnMeta['Default'])
     ) {
         $columnMeta['Default'] = '';
-    }
-
-    if ($type_upper == 'BIT') {
+    } elseif ($type_upper == 'BIT') {
         $columnMeta['DefaultValue']
             = PMA_Util::convertBitDefaultValue($columnMeta['DefaultValue']);
+    } elseif ($type_upper == 'BINARY' || $type_upper == 'VARBINARY') {
+        $columnMeta['DefaultValue'] = bin2hex($columnMeta['DefaultValue']);
     }
 
     $html = '<select name="field_default_type[' . $columnNumber