rfe #2308632 [edit] Use hex for (var)binary fields

2009-09-05 18:31:35 +00:00
parent e5de5d96a5
commit 9fcea694ff
60 changed files with 96 additions and 3 deletions
--- a/2
+++ b/2
@@ -6,6 +6,8 @@ $Id$
 $HeadURL: https://phpmyadmin.svn.sourceforge.net/svnroot/phpmyadmin/trunk/phpMyAdmin/ChangeLog $

 3.3.0.0 (not yet released)
+ rfe #2308632 [edit] Use hex for (var)binary fields,
+  thanks to Maarten Dieleman - maartendieleman
 + patch #2794819 [navi] Filter for displayed table names,
  thanks to Michael Valushko - dylfin
 - bug #2794840 [core] Cannot redeclare pma_tableheader() 
--- a/lang/afrikaans-utf-8.inc.php
+++ b/lang/afrikaans-utf-8.inc.php
@@ -1629,4 +1629,5 @@ $strShowMasterStatus = 'Show master status';  //to translate
 $strSlaveConfigure = 'Make sure, you have unique server-id in your configuration file (my.cnf). If not, please add following line into [mysqld] section:';  //to translate
 $strReplicationUnknownError = 'Unknown error';  //to translate
 $strReplicationUnableToChange = 'Unable to change master';  //to translate
+$strShowBinaryContentsAsHex = 'Show binary contents as HEX';  //to translate
 ?>
--- a/lang/albanian-utf-8.inc.php
+++ b/lang/albanian-utf-8.inc.php
@@ -1628,4 +1628,5 @@ $strShowMasterStatus = 'Show master status';  //to translate
 $strSlaveConfigure = 'Make sure, you have unique server-id in your configuration file (my.cnf). If not, please add following line into [mysqld] section:';  //to translate
 $strReplicationUnknownError = 'Unknown error';  //to translate
 $strReplicationUnableToChange = 'Unable to change master';  //to translate
+$strShowBinaryContentsAsHex = 'Show binary contents as HEX';  //to translate
 ?>
--- a/lang/arabic-utf-8.inc.php
+++ b/lang/arabic-utf-8.inc.php
@@ -1631,4 +1631,5 @@ $strShowMasterStatus = 'Show master status';  //to translate
 $strSlaveConfigure = 'Make sure, you have unique server-id in your configuration file (my.cnf). If not, please add following line into [mysqld] section:';  //to translate
 $strReplicationUnknownError = 'Unknown error';  //to translate
 $strReplicationUnableToChange = 'Unable to change master';  //to translate
+$strShowBinaryContentsAsHex = 'Show binary contents as HEX';  //to translate
 ?>
--- a/lang/azerbaijani-utf-8.inc.php
+++ b/lang/azerbaijani-utf-8.inc.php
@@ -1625,4 +1625,5 @@ $strShowMasterStatus = 'Show master status';  //to translate
 $strSlaveConfigure = 'Make sure, you have unique server-id in your configuration file (my.cnf). If not, please add following line into [mysqld] section:';  //to translate
 $strReplicationUnknownError = 'Unknown error';  //to translate
 $strReplicationUnableToChange = 'Unable to change master';  //to translate
+$strShowBinaryContentsAsHex = 'Show binary contents as HEX';  //to translate
 ?>
--- a/lang/bangla-utf-8.inc.php
+++ b/lang/bangla-utf-8.inc.php
@@ -1604,4 +1604,5 @@ $strShowMasterStatus = 'Show master status';  //to translate
 $strSlaveConfigure = 'Make sure, you have unique server-id in your configuration file (my.cnf). If not, please add following line into [mysqld] section:';  //to translate
 $strReplicationUnknownError = 'Unknown error';  //to translate
 $strReplicationUnableToChange = 'Unable to change master';  //to translate
+$strShowBinaryContentsAsHex = 'Show binary contents as HEX';  //to translate
 ?>
--- a/lang/basque-utf-8.inc.php
+++ b/lang/basque-utf-8.inc.php
@@ -1622,4 +1622,5 @@ $strShowMasterStatus = 'Show master status';  //to translate
 $strSlaveConfigure = 'Make sure, you have unique server-id in your configuration file (my.cnf). If not, please add following line into [mysqld] section:';  //to translate
 $strReplicationUnknownError = 'Unknown error';  //to translate
 $strReplicationUnableToChange = 'Unable to change master';  //to translate
+$strShowBinaryContentsAsHex = 'Show binary contents as HEX';  //to translate
 ?>
--- a/lang/belarusian_cyrillic-utf-8.inc.php
+++ b/lang/belarusian_cyrillic-utf-8.inc.php
@@ -1604,4 +1604,5 @@ $strShowMasterStatus = 'Show master status';  //to translate
 $strSlaveConfigure = 'Make sure, you have unique server-id in your configuration file (my.cnf). If not, please add following line into [mysqld] section:';  //to translate
 $strReplicationUnknownError = 'Unknown error';  //to translate
 $strReplicationUnableToChange = 'Unable to change master';  //to translate
+$strShowBinaryContentsAsHex = 'Show binary contents as HEX';  //to translate
 ?>
--- a/lang/belarusian_latin-utf-8.inc.php
+++ b/lang/belarusian_latin-utf-8.inc.php
@@ -1612,4 +1612,5 @@ $strShowMasterStatus = 'Show master status';  //to translate
 $strSlaveConfigure = 'Make sure, you have unique server-id in your configuration file (my.cnf). If not, please add following line into [mysqld] section:';  //to translate
 $strReplicationUnknownError = 'Unknown error';  //to translate
 $strReplicationUnableToChange = 'Unable to change master';  //to translate
+$strShowBinaryContentsAsHex = 'Show binary contents as HEX';  //to translate
 ?>
--- a/lang/bosnian-utf-8.inc.php
+++ b/lang/bosnian-utf-8.inc.php
@@ -1628,4 +1628,5 @@ $strShowMasterStatus = 'Show master status';  //to translate
 $strSlaveConfigure = 'Make sure, you have unique server-id in your configuration file (my.cnf). If not, please add following line into [mysqld] section:';  //to translate
 $strReplicationUnknownError = 'Unknown error';  //to translate
 $strReplicationUnableToChange = 'Unable to change master';  //to translate
+$strShowBinaryContentsAsHex = 'Show binary contents as HEX';  //to translate
 ?>
--- a/lang/brazilian_portuguese-utf-8.inc.php
+++ b/lang/brazilian_portuguese-utf-8.inc.php
@@ -1619,4 +1619,5 @@ $strShowMasterStatus = 'Show master status';  //to translate
 $strSlaveConfigure = 'Make sure, you have unique server-id in your configuration file (my.cnf). If not, please add following line into [mysqld] section:';  //to translate
 $strReplicationUnknownError = 'Unknown error';  //to translate
 $strReplicationUnableToChange = 'Unable to change master';  //to translate
+$strShowBinaryContentsAsHex = 'Show binary contents as HEX';  //to translate
 ?>
--- a/lang/bulgarian-utf-8.inc.php
+++ b/lang/bulgarian-utf-8.inc.php
@@ -1625,4 +1625,5 @@ $strShowMasterStatus = 'Show master status';  //to translate
 $strSlaveConfigure = 'Make sure, you have unique server-id in your configuration file (my.cnf). If not, please add following line into [mysqld] section:';  //to translate
 $strReplicationUnknownError = 'Unknown error';  //to translate
 $strReplicationUnableToChange = 'Unable to change master';  //to translate
+$strShowBinaryContentsAsHex = 'Show binary contents as HEX';  //to translate
 ?>
--- a/lang/catalan-utf-8.inc.php
+++ b/lang/catalan-utf-8.inc.php
@@ -1599,4 +1599,5 @@ $strShowMasterStatus = 'Show master status';  //to translate
 $strSlaveConfigure = 'Make sure, you have unique server-id in your configuration file (my.cnf). If not, please add following line into [mysqld] section:';  //to translate
 $strReplicationUnknownError = 'Unknown error';  //to translate
 $strReplicationUnableToChange = 'Unable to change master';  //to translate
+$strShowBinaryContentsAsHex = 'Show binary contents as HEX';  //to translate
 ?>
--- a/lang/chinese_simplified-utf-8.inc.php
+++ b/lang/chinese_simplified-utf-8.inc.php
@@ -1612,4 +1612,5 @@ $strShowMasterStatus = 'Show master status';  //to translate
 $strSlaveConfigure = 'Make sure, you have unique server-id in your configuration file (my.cnf). If not, please add following line into [mysqld] section:';  //to translate
 $strReplicationUnknownError = 'Unknown error';  //to translate
 $strReplicationUnableToChange = 'Unable to change master';  //to translate
+$strShowBinaryContentsAsHex = 'Show binary contents as HEX';  //to translate
 ?>
--- a/lang/chinese_traditional-utf-8.inc.php
+++ b/lang/chinese_traditional-utf-8.inc.php
@@ -1609,4 +1609,5 @@ $strShowMasterStatus = 'Show master status';  //to translate
 $strSlaveConfigure = 'Make sure, you have unique server-id in your configuration file (my.cnf). If not, please add following line into [mysqld] section:';  //to translate
 $strReplicationUnknownError = 'Unknown error';  //to translate
 $strReplicationUnableToChange = 'Unable to change master';  //to translate
+$strShowBinaryContentsAsHex = 'Show binary contents as HEX';  //to translate
 ?>
--- a/lang/croatian-utf-8.inc.php
+++ b/lang/croatian-utf-8.inc.php
@@ -1606,4 +1606,5 @@ $strShowMasterStatus = 'Show master status';  //to translate
 $strSlaveConfigure = 'Make sure, you have unique server-id in your configuration file (my.cnf). If not, please add following line into [mysqld] section:';  //to translate
 $strReplicationUnknownError = 'Unknown error';  //to translate
 $strReplicationUnableToChange = 'Unable to change master';  //to translate
+$strShowBinaryContentsAsHex = 'Show binary contents as HEX';  //to translate
 ?>
--- a/lang/czech-utf-8.inc.php
+++ b/lang/czech-utf-8.inc.php
@@ -1609,4 +1609,5 @@ $strSetupZipDumpExportWarning = '[a@?page=form&amp;formset=features#tab_Import_e
 $strSetupZipDumpImportWarning = '[a@?page=form&amp;formset=features#tab_Import_export]Zip decompression[/a] requires functions (%s) which are unavailable on this system.';  //to translate
 $strSlaveConfigure = 'Make sure, you have unique server-id in your configuration file (my.cnf). If not, please add following line into [mysqld] section:';  //to translate

+$strShowBinaryContentsAsHex = 'Show binary contents as HEX';  //to translate
 ?>
--- a/lang/danish-utf-8.inc.php
+++ b/lang/danish-utf-8.inc.php
@@ -1604,4 +1604,5 @@ $strShowMasterStatus = 'Show master status';  //to translate
 $strSlaveConfigure = 'Make sure, you have unique server-id in your configuration file (my.cnf). If not, please add following line into [mysqld] section:';  //to translate
 $strReplicationUnknownError = 'Unknown error';  //to translate
 $strReplicationUnableToChange = 'Unable to change master';  //to translate
+$strShowBinaryContentsAsHex = 'Show binary contents as HEX';  //to translate
 ?>
--- a/lang/dutch-utf-8.inc.php
+++ b/lang/dutch-utf-8.inc.php
@@ -1609,4 +1609,5 @@ $strShowMasterStatus = 'Show master status';  //to translate
 $strSlaveConfigure = 'Make sure, you have unique server-id in your configuration file (my.cnf). If not, please add following line into [mysqld] section:';  //to translate
 $strReplicationUnknownError = 'Unknown error';  //to translate
 $strReplicationUnableToChange = 'Unable to change master';  //to translate
+$strShowBinaryContentsAsHex = 'Show binary contents as HEX';  //to translate
 ?>
--- a/lang/english-utf-8.inc.php
+++ b/lang/english-utf-8.inc.php
@@ -1207,6 +1207,7 @@ $strSetupZipDumpExportWarning = '[a@?page=form&amp;formset=features#tab_Import_e
 $strSetupZipDumpImportWarning = '[a@?page=form&amp;formset=features#tab_Import_export]Zip decompression[/a] requires functions (%s) which are unavailable on this system.';
 $strSetupZipDump_name = 'ZIP';
 $strShowAll = 'Show all';
+$strShowBinaryContentsAsHex = 'Show binary contents as HEX';
 $strShowBinaryContents = 'Show binary contents';
 $strShowBLOBContents = 'Show BLOB contents';
 $strShowColor = 'Show color';
--- a/lang/estonian-utf-8.inc.php
+++ b/lang/estonian-utf-8.inc.php
@@ -1610,4 +1610,5 @@ $strShowMasterStatus = 'Show master status';  //to translate
 $strSlaveConfigure = 'Make sure, you have unique server-id in your configuration file (my.cnf). If not, please add following line into [mysqld] section:';  //to translate
 $strReplicationUnknownError = 'Unknown error';  //to translate
 $strReplicationUnableToChange = 'Unable to change master';  //to translate
+$strShowBinaryContentsAsHex = 'Show binary contents as HEX';  //to translate
 ?>
--- a/lang/finnish-utf-8.inc.php
+++ b/lang/finnish-utf-8.inc.php
@@ -1605,4 +1605,5 @@ $strShowMasterStatus = 'Show master status';  //to translate
 $strSlaveConfigure = 'Make sure, you have unique server-id in your configuration file (my.cnf). If not, please add following line into [mysqld] section:';  //to translate
 $strReplicationUnknownError = 'Unknown error';  //to translate
 $strReplicationUnableToChange = 'Unable to change master';  //to translate
+$strShowBinaryContentsAsHex = 'Show binary contents as HEX';  //to translate
 ?>
--- a/lang/french-utf-8.inc.php
+++ b/lang/french-utf-8.inc.php
@@ -1601,4 +1601,5 @@ $strShowMasterStatus = 'Show master status';  //to translate
 $strSlaveConfigure = 'Make sure, you have unique server-id in your configuration file (my.cnf). If not, please add following line into [mysqld] section:';  //to translate
 $strReplicationUnknownError = 'Unknown error';  //to translate
 $strReplicationUnableToChange = 'Unable to change master';  //to translate
+$strShowBinaryContentsAsHex = 'Show binary contents as HEX';  //to translate
 ?>
--- a/lang/galician-utf-8.inc.php
+++ b/lang/galician-utf-8.inc.php
@@ -1604,4 +1604,5 @@ $strShowMasterStatus = 'Show master status';  //to translate
 $strSlaveConfigure = 'Make sure, you have unique server-id in your configuration file (my.cnf). If not, please add following line into [mysqld] section:';  //to translate
 $strReplicationUnknownError = 'Unknown error';  //to translate
 $strReplicationUnableToChange = 'Unable to change master';  //to translate
+$strShowBinaryContentsAsHex = 'Show binary contents as HEX';  //to translate
 ?>
--- a/lang/georgian-utf-8.inc.php
+++ b/lang/georgian-utf-8.inc.php
@@ -1609,4 +1609,5 @@ $strShowMasterStatus = 'Show master status';  //to translate
 $strSlaveConfigure = 'Make sure, you have unique server-id in your configuration file (my.cnf). If not, please add following line into [mysqld] section:';  //to translate
 $strReplicationUnknownError = 'Unknown error';  //to translate
 $strReplicationUnableToChange = 'Unable to change master';  //to translate
+$strShowBinaryContentsAsHex = 'Show binary contents as HEX';  //to translate
 ?>
--- a/lang/german-utf-8.inc.php
+++ b/lang/german-utf-8.inc.php
@@ -1619,4 +1619,5 @@ $strShowMasterStatus = 'Show master status';  //to translate
 $strSlaveConfigure = 'Make sure, you have unique server-id in your configuration file (my.cnf). If not, please add following line into [mysqld] section:';  //to translate
 $strReplicationUnknownError = 'Unknown error';  //to translate
 $strReplicationUnableToChange = 'Unable to change master';  //to translate
+$strShowBinaryContentsAsHex = 'Show binary contents as HEX';  //to translate
 ?>
--- a/lang/greek-utf-8.inc.php
+++ b/lang/greek-utf-8.inc.php
@@ -1627,4 +1627,5 @@ $strShowMasterStatus = 'Show master status';  //to translate
 $strSlaveConfigure = 'Make sure, you have unique server-id in your configuration file (my.cnf). If not, please add following line into [mysqld] section:';  //to translate
 $strReplicationUnknownError = 'Unknown error';  //to translate
 $strReplicationUnableToChange = 'Unable to change master';  //to translate
+$strShowBinaryContentsAsHex = 'Show binary contents as HEX';  //to translate
 ?>
--- a/lang/hebrew-utf-8.inc.php
+++ b/lang/hebrew-utf-8.inc.php
@@ -1622,4 +1622,5 @@ $strShowMasterStatus = 'Show master status';  //to translate
 $strSlaveConfigure = 'Make sure, you have unique server-id in your configuration file (my.cnf). If not, please add following line into [mysqld] section:';  //to translate
 $strReplicationUnknownError = 'Unknown error';  //to translate
 $strReplicationUnableToChange = 'Unable to change master';  //to translate
+$strShowBinaryContentsAsHex = 'Show binary contents as HEX';  //to translate
 ?>
--- a/lang/hindi-utf-8.inc.php
+++ b/lang/hindi-utf-8.inc.php
@@ -1630,4 +1630,5 @@ $strShowMasterStatus = 'Show master status';  //to translate
 $strSlaveConfigure = 'Make sure, you have unique server-id in your configuration file (my.cnf). If not, please add following line into [mysqld] section:';  //to translate
 $strReplicationUnknownError = 'Unknown error';  //to translate
 $strReplicationUnableToChange = 'Unable to change master';  //to translate
+$strShowBinaryContentsAsHex = 'Show binary contents as HEX';  //to translate
 ?>
--- a/lang/hungarian-utf-8.inc.php
+++ b/lang/hungarian-utf-8.inc.php
@@ -1606,4 +1606,5 @@ $strShowMasterStatus = 'Show master status';  //to translate
 $strSlaveConfigure = 'Make sure, you have unique server-id in your configuration file (my.cnf). If not, please add following line into [mysqld] section:';  //to translate
 $strReplicationUnknownError = 'Unknown error';  //to translate
 $strReplicationUnableToChange = 'Unable to change master';  //to translate
+$strShowBinaryContentsAsHex = 'Show binary contents as HEX';  //to translate
 ?>
--- a/lang/indonesian-utf-8.inc.php
+++ b/lang/indonesian-utf-8.inc.php
@@ -1620,4 +1620,5 @@ $strShowMasterStatus = 'Show master status';  //to translate
 $strSlaveConfigure = 'Make sure, you have unique server-id in your configuration file (my.cnf). If not, please add following line into [mysqld] section:';  //to translate
 $strReplicationUnknownError = 'Unknown error';  //to translate
 $strReplicationUnableToChange = 'Unable to change master';  //to translate
+$strShowBinaryContentsAsHex = 'Show binary contents as HEX';  //to translate
 ?>
--- a/lang/italian-utf-8.inc.php
+++ b/lang/italian-utf-8.inc.php
@@ -1609,4 +1609,5 @@ $strShowMasterStatus = 'Show master status';  //to translate
 $strSlaveConfigure = 'Make sure, you have unique server-id in your configuration file (my.cnf). If not, please add following line into [mysqld] section:';  //to translate
 $strReplicationUnknownError = 'Unknown error';  //to translate
 $strReplicationUnableToChange = 'Unable to change master';  //to translate
+$strShowBinaryContentsAsHex = 'Show binary contents as HEX';  //to translate
 ?>
--- a/lang/japanese-utf-8.inc.php
+++ b/lang/japanese-utf-8.inc.php
@@ -1610,4 +1610,5 @@ $strShowMasterStatus = 'Show master status';  //to translate
 $strSlaveConfigure = 'Make sure, you have unique server-id in your configuration file (my.cnf). If not, please add following line into [mysqld] section:';  //to translate
 $strReplicationUnknownError = 'Unknown error';  //to translate
 $strReplicationUnableToChange = 'Unable to change master';  //to translate
+$strShowBinaryContentsAsHex = 'Show binary contents as HEX';  //to translate
 ?>
--- a/lang/korean-utf-8.inc.php
+++ b/lang/korean-utf-8.inc.php
@@ -1625,4 +1625,5 @@ $strShowMasterStatus = 'Show master status';  //to translate
 $strSlaveConfigure = 'Make sure, you have unique server-id in your configuration file (my.cnf). If not, please add following line into [mysqld] section:';  //to translate
 $strReplicationUnknownError = 'Unknown error';  //to translate
 $strReplicationUnableToChange = 'Unable to change master';  //to translate
+$strShowBinaryContentsAsHex = 'Show binary contents as HEX';  //to translate
 ?>
--- a/lang/latvian-utf-8.inc.php
+++ b/lang/latvian-utf-8.inc.php
@@ -1627,4 +1627,5 @@ $strShowMasterStatus = 'Show master status';  //to translate
 $strSlaveConfigure = 'Make sure, you have unique server-id in your configuration file (my.cnf). If not, please add following line into [mysqld] section:';  //to translate
 $strReplicationUnknownError = 'Unknown error';  //to translate
 $strReplicationUnableToChange = 'Unable to change master';  //to translate
+$strShowBinaryContentsAsHex = 'Show binary contents as HEX';  //to translate
 ?>
--- a/lang/lithuanian-utf-8.inc.php
+++ b/lang/lithuanian-utf-8.inc.php
@@ -1619,4 +1619,5 @@ $strShowMasterStatus = 'Show master status';  //to translate
 $strSlaveConfigure = 'Make sure, you have unique server-id in your configuration file (my.cnf). If not, please add following line into [mysqld] section:';  //to translate
 $strReplicationUnknownError = 'Unknown error';  //to translate
 $strReplicationUnableToChange = 'Unable to change master';  //to translate
+$strShowBinaryContentsAsHex = 'Show binary contents as HEX';  //to translate
 ?>
--- a/lang/macedonian_cyrillic-utf-8.inc.php
+++ b/lang/macedonian_cyrillic-utf-8.inc.php
@@ -1605,4 +1605,5 @@ $strShowMasterStatus = 'Show master status';  //to translate
 $strSlaveConfigure = 'Make sure, you have unique server-id in your configuration file (my.cnf). If not, please add following line into [mysqld] section:';  //to translate
 $strReplicationUnknownError = 'Unknown error';  //to translate
 $strReplicationUnableToChange = 'Unable to change master';  //to translate
+$strShowBinaryContentsAsHex = 'Show binary contents as HEX';  //to translate
 ?>
--- a/lang/malay-utf-8.inc.php
+++ b/lang/malay-utf-8.inc.php
@@ -1642,4 +1642,5 @@ $strShowMasterStatus = 'Show master status';  //to translate
 $strSlaveConfigure = 'Make sure, you have unique server-id in your configuration file (my.cnf). If not, please add following line into [mysqld] section:';  //to translate
 $strReplicationUnknownError = 'Unknown error';  //to translate
 $strReplicationUnableToChange = 'Unable to change master';  //to translate
+$strShowBinaryContentsAsHex = 'Show binary contents as HEX';  //to translate
 ?>
--- a/lang/mongolian-utf-8.inc.php
+++ b/lang/mongolian-utf-8.inc.php
@@ -1625,4 +1625,5 @@ $strShowMasterStatus = 'Show master status';  //to translate
 $strSlaveConfigure = 'Make sure, you have unique server-id in your configuration file (my.cnf). If not, please add following line into [mysqld] section:';  //to translate
 $strReplicationUnknownError = 'Unknown error';  //to translate
 $strReplicationUnableToChange = 'Unable to change master';  //to translate
+$strShowBinaryContentsAsHex = 'Show binary contents as HEX';  //to translate
 ?>
--- a/lang/norwegian-utf-8.inc.php
+++ b/lang/norwegian-utf-8.inc.php
@@ -1602,4 +1602,5 @@ $strShowMasterStatus = 'Show master status';  //to translate
 $strSlaveConfigure = 'Make sure, you have unique server-id in your configuration file (my.cnf). If not, please add following line into [mysqld] section:';  //to translate
 $strReplicationUnknownError = 'Unknown error';  //to translate
 $strReplicationUnableToChange = 'Unable to change master';  //to translate
+$strShowBinaryContentsAsHex = 'Show binary contents as HEX';  //to translate
 ?>
--- a/lang/persian-utf-8.inc.php
+++ b/lang/persian-utf-8.inc.php
@@ -1656,4 +1656,5 @@ $strShowMasterStatus = 'Show master status';  //to translate
 $strSlaveConfigure = 'Make sure, you have unique server-id in your configuration file (my.cnf). If not, please add following line into [mysqld] section:';  //to translate
 $strReplicationUnknownError = 'Unknown error';  //to translate
 $strReplicationUnableToChange = 'Unable to change master';  //to translate
+$strShowBinaryContentsAsHex = 'Show binary contents as HEX';  //to translate
 ?>
--- a/lang/polish-utf-8.inc.php
+++ b/lang/polish-utf-8.inc.php
@@ -1598,4 +1598,5 @@ $strShowMasterStatus = 'Show master status';  //to translate
 $strSlaveConfigure = 'Make sure, you have unique server-id in your configuration file (my.cnf). If not, please add following line into [mysqld] section:';  //to translate
 $strReplicationUnknownError = 'Unknown error';  //to translate
 $strReplicationUnableToChange = 'Unable to change master';  //to translate
+$strShowBinaryContentsAsHex = 'Show binary contents as HEX';  //to translate
 ?>
--- a/lang/portuguese-utf-8.inc.php
+++ b/lang/portuguese-utf-8.inc.php
@@ -1631,4 +1631,5 @@ $strShowMasterStatus = 'Show master status';  //to translate
 $strSlaveConfigure = 'Make sure, you have unique server-id in your configuration file (my.cnf). If not, please add following line into [mysqld] section:';  //to translate
 $strReplicationUnknownError = 'Unknown error';  //to translate
 $strReplicationUnableToChange = 'Unable to change master';  //to translate
+$strShowBinaryContentsAsHex = 'Show binary contents as HEX';  //to translate
 ?>
--- a/lang/romanian-utf-8.inc.php
+++ b/lang/romanian-utf-8.inc.php
@@ -1611,4 +1611,5 @@ $strShowMasterStatus = 'Show master status';  //to translate
 $strSlaveConfigure = 'Make sure, you have unique server-id in your configuration file (my.cnf). If not, please add following line into [mysqld] section:';  //to translate
 $strReplicationUnknownError = 'Unknown error';  //to translate
 $strReplicationUnableToChange = 'Unable to change master';  //to translate
+$strShowBinaryContentsAsHex = 'Show binary contents as HEX';  //to translate
 ?>
--- a/lang/russian-utf-8.inc.php
+++ b/lang/russian-utf-8.inc.php
@@ -1615,4 +1615,5 @@ $strShowMasterStatus = 'Show master status';  //to translate
 $strSlaveConfigure = 'Make sure, you have unique server-id in your configuration file (my.cnf). If not, please add following line into [mysqld] section:';  //to translate
 $strReplicationUnknownError = 'Unknown error';  //to translate
 $strReplicationUnableToChange = 'Unable to change master';  //to translate
+$strShowBinaryContentsAsHex = 'Show binary contents as HEX';  //to translate
 ?>
--- a/lang/serbian_cyrillic-utf-8.inc.php
+++ b/lang/serbian_cyrillic-utf-8.inc.php
@@ -1604,4 +1604,5 @@ $strShowMasterStatus = 'Show master status';  //to translate
 $strSlaveConfigure = 'Make sure, you have unique server-id in your configuration file (my.cnf). If not, please add following line into [mysqld] section:';  //to translate
 $strReplicationUnknownError = 'Unknown error';  //to translate
 $strReplicationUnableToChange = 'Unable to change master';  //to translate
+$strShowBinaryContentsAsHex = 'Show binary contents as HEX';  //to translate
 ?>
--- a/lang/serbian_latin-utf-8.inc.php
+++ b/lang/serbian_latin-utf-8.inc.php
@@ -1604,4 +1604,5 @@ $strShowMasterStatus = 'Show master status';  //to translate
 $strSlaveConfigure = 'Make sure, you have unique server-id in your configuration file (my.cnf). If not, please add following line into [mysqld] section:';  //to translate
 $strReplicationUnknownError = 'Unknown error';  //to translate
 $strReplicationUnableToChange = 'Unable to change master';  //to translate
+$strShowBinaryContentsAsHex = 'Show binary contents as HEX';  //to translate
 ?>
--- a/lang/sinhala-utf-8.inc.php
+++ b/lang/sinhala-utf-8.inc.php
@@ -1607,4 +1607,5 @@ $strShowMasterStatus = 'Show master status';  //to translate
 $strSlaveConfigure = 'Make sure, you have unique server-id in your configuration file (my.cnf). If not, please add following line into [mysqld] section:';  //to translate
 $strReplicationUnknownError = 'Unknown error';  //to translate
 $strReplicationUnableToChange = 'Unable to change master';  //to translate
+$strShowBinaryContentsAsHex = 'Show binary contents as HEX';  //to translate
 ?>
--- a/lang/slovak-utf-8.inc.php
+++ b/lang/slovak-utf-8.inc.php
@@ -1605,4 +1605,5 @@ $strShowMasterStatus = 'Show master status';  //to translate
 $strSlaveConfigure = 'Make sure, you have unique server-id in your configuration file (my.cnf). If not, please add following line into [mysqld] section:';  //to translate
 $strReplicationUnknownError = 'Unknown error';  //to translate
 $strReplicationUnableToChange = 'Unable to change master';  //to translate
+$strShowBinaryContentsAsHex = 'Show binary contents as HEX';  //to translate
 ?>
--- a/lang/slovenian-utf-8.inc.php
+++ b/lang/slovenian-utf-8.inc.php
@@ -1624,4 +1624,5 @@ $strShowMasterStatus = 'Show master status';  //to translate
 $strSlaveConfigure = 'Make sure, you have unique server-id in your configuration file (my.cnf). If not, please add following line into [mysqld] section:';  //to translate
 $strReplicationUnknownError = 'Unknown error';  //to translate
 $strReplicationUnableToChange = 'Unable to change master';  //to translate
+$strShowBinaryContentsAsHex = 'Show binary contents as HEX';  //to translate
 ?>
--- a/lang/spanish-utf-8.inc.php
+++ b/lang/spanish-utf-8.inc.php
@@ -1602,4 +1602,5 @@ $strShowMasterStatus = 'Show master status';  //to translate
 $strSlaveConfigure = 'Make sure, you have unique server-id in your configuration file (my.cnf). If not, please add following line into [mysqld] section:';  //to translate
 $strReplicationUnknownError = 'Unknown error';  //to translate
 $strReplicationUnableToChange = 'Unable to change master';  //to translate
+$strShowBinaryContentsAsHex = 'Show binary contents as HEX';  //to translate
 ?>
--- a/lang/swedish-utf-8.inc.php
+++ b/lang/swedish-utf-8.inc.php
@@ -1601,4 +1601,5 @@ $strShowMasterStatus = 'Show master status';  //to translate
 $strSlaveConfigure = 'Make sure, you have unique server-id in your configuration file (my.cnf). If not, please add following line into [mysqld] section:';  //to translate
 $strReplicationUnknownError = 'Unknown error';  //to translate
 $strReplicationUnableToChange = 'Unable to change master';  //to translate
+$strShowBinaryContentsAsHex = 'Show binary contents as HEX';  //to translate
 ?>
--- a/lang/tatarish-utf-8.inc.php
+++ b/lang/tatarish-utf-8.inc.php
@@ -1615,4 +1615,5 @@ $strShowMasterStatus = 'Show master status';  //to translate
 $strSlaveConfigure = 'Make sure, you have unique server-id in your configuration file (my.cnf). If not, please add following line into [mysqld] section:';  //to translate
 $strReplicationUnknownError = 'Unknown error';  //to translate
 $strReplicationUnableToChange = 'Unable to change master';  //to translate
+$strShowBinaryContentsAsHex = 'Show binary contents as HEX';  //to translate
 ?>
--- a/lang/thai-utf-8.inc.php
+++ b/lang/thai-utf-8.inc.php
@@ -1626,4 +1626,5 @@ $strShowMasterStatus = 'Show master status';  //to translate
 $strSlaveConfigure = 'Make sure, you have unique server-id in your configuration file (my.cnf). If not, please add following line into [mysqld] section:';  //to translate
 $strReplicationUnknownError = 'Unknown error';  //to translate
 $strReplicationUnableToChange = 'Unable to change master';  //to translate
+$strShowBinaryContentsAsHex = 'Show binary contents as HEX';  //to translate
 ?>
--- a/lang/turkish-utf-8.inc.php
+++ b/lang/turkish-utf-8.inc.php
@@ -1608,4 +1608,5 @@ $strShowMasterStatus = 'Show master status';  //to translate
 $strSlaveConfigure = 'Make sure, you have unique server-id in your configuration file (my.cnf). If not, please add following line into [mysqld] section:';  //to translate
 $strReplicationUnknownError = 'Unknown error';  //to translate
 $strReplicationUnableToChange = 'Unable to change master';  //to translate
+$strShowBinaryContentsAsHex = 'Show binary contents as HEX';  //to translate
 ?>
--- a/lang/ukrainian-utf-8.inc.php
+++ b/lang/ukrainian-utf-8.inc.php
@@ -1624,4 +1624,5 @@ $strShowMasterStatus = 'Show master status';  //to translate
 $strSlaveConfigure = 'Make sure, you have unique server-id in your configuration file (my.cnf). If not, please add following line into [mysqld] section:';  //to translate
 $strReplicationUnknownError = 'Unknown error';  //to translate
 $strReplicationUnableToChange = 'Unable to change master';  //to translate
+$strShowBinaryContentsAsHex = 'Show binary contents as HEX';  //to translate
 ?>
--- a/lang/uzbek_cyrillic-utf-8.inc.php
+++ b/lang/uzbek_cyrillic-utf-8.inc.php
@@ -1606,4 +1606,5 @@ $strShowMasterStatus = 'Show master status';  //to translate
 $strSlaveConfigure = 'Make sure, you have unique server-id in your configuration file (my.cnf). If not, please add following line into [mysqld] section:';  //to translate
 $strReplicationUnknownError = 'Unknown error';  //to translate
 $strReplicationUnableToChange = 'Unable to change master';  //to translate
+$strShowBinaryContentsAsHex = 'Show binary contents as HEX';  //to translate
 ?>
--- a/lang/uzbek_latin-utf-8.inc.php
+++ b/lang/uzbek_latin-utf-8.inc.php
@@ -1606,4 +1606,5 @@ $strShowMasterStatus = 'Show master status';  //to translate
 $strSlaveConfigure = 'Make sure, you have unique server-id in your configuration file (my.cnf). If not, please add following line into [mysqld] section:';  //to translate
 $strReplicationUnknownError = 'Unknown error';  //to translate
 $strReplicationUnableToChange = 'Unable to change master';  //to translate
+$strShowBinaryContentsAsHex = 'Show binary contents as HEX';  //to translate
 ?>
--- a/libraries/display_tbl.lib.php
+++ b/libraries/display_tbl.lib.php
@@ -436,6 +436,7 @@ onsubmit="return (checkFormElementInRange(this, 'session_max_rows', '<?php echo
 * @uses    $_SESSION['tmp_user_values']['max_rows']
 * @uses    $_SESSION['tmp_user_values']['display_text']
 * @uses    $_SESSION['tmp_user_values']['display_binary']
+ * @uses    $_SESSION['tmp_user_values']['display_binary_as_hex']
 * @param   array    which elements to display
 * @param   array    the list of fields properties
 * @param   integer  the total number of fields returned by the SQL query
@@ -594,6 +595,8 @@ function PMA_displayTableHeaders(&$is_display, &$fields_meta, $fields_cnt = 0, $
        PMA_display_html_checkbox('display_binary', $GLOBALS['strShowBinaryContents'], ! empty($_SESSION['tmp_user_values']['display_binary']), false);
        echo '<br />';
        PMA_display_html_checkbox('display_blob', $GLOBALS['strShowBLOBContents'], ! empty($_SESSION['tmp_user_values']['display_blob']), false);
+        echo '<br />';
+        PMA_display_html_checkbox('display_binary_as_hex', $GLOBALS['strShowBinaryContentsAsHex'], ! empty($_SESSION['tmp_user_values']['display_binary_as_hex']), false);
        echo '</div>';

        // I would have preferred to name this "display_transformation".
@@ -962,6 +965,7 @@ function PMA_displayTableHeaders(&$is_display, &$fields_meta, $fields_cnt = 0, $
 * @uses    $_SESSION['tmp_user_values']['max_rows']
 * @uses    $_SESSION['tmp_user_values']['display_text']
 * @uses    $_SESSION['tmp_user_values']['display_binary']
+ * @uses    $_SESSION['tmp_user_values']['display_binary_as_hex']
 * @uses    $_SESSION['tmp_user_values']['display_blob']
 * @param   integer  the link id associated to the query which results have
 *                   to be displayed
@@ -1359,7 +1363,12 @@ function PMA_displayTableBody(&$dt_result, &$is_display, $map, $analyzed_sql) {
                            // fields, or we detected a PROCEDURE ANALYSE in
                            // the query (results are reported as being
                            // binary strings)
-                            $row[$i] = PMA_replace_binary_contents($row[$i]);
+                            if ($_SESSION['tmp_user_values']['display_binary_as_hex']) {
+                            	$row[$i] = bin2hex($row[$i]);
+							}
+							else {
+                            	$row[$i] = PMA_replace_binary_contents($row[$i]);
+							}
                        } else {
                            // we show the BINARY message and field's size
                            // (or maybe use a transformation)
@@ -1624,6 +1633,8 @@ function PMA_displayVerticalTable()
 * @uses    $_REQUEST['relational_display']
 * @uses    $_SESSION['tmp_user_values']['display_binary']
 * @uses    $_REQUEST['display_binary']
+ * @uses    $_SESSION['tmp_user_values']['display_binary_as_hex']
+ * @uses    $_REQUEST['display_binary_as_hex']
 * @uses    $_SESSION['tmp_user_values']['display_blob']
 * @uses    $_REQUEST['display_blob']
 * @uses    PMA_isValid()
@@ -1694,6 +1705,19 @@ function PMA_displayTable_checkConfigParams()
        $_SESSION['tmp_user_values']['query'][$sql_key]['display_binary'] = true;
    }
    
+    if (isset($_REQUEST['display_binary_as_hex'])) {
+        $_SESSION['tmp_user_values']['query'][$sql_key]['display_binary_as_hex'] = true;
+        unset($_REQUEST['display_binary_as_hex']);
+    } elseif (isset($_REQUEST['display_options_form'])) {
+        // we know that the checkbox was unchecked
+        unset($_SESSION['tmp_user_values']['query'][$sql_key]['display_binary_as_hex']);
+    } else {
+        // display_binary_as_hex config option
+        if (isset($GLOBALS['cfg']['DisplayBinaryAsHex']) && true === $GLOBALS['cfg']['DisplayBinaryAsHex']) {
+        	$_SESSION['tmp_user_values']['query'][$sql_key]['display_binary_as_hex'] = true;
+		}
+    }
+
    if (isset($_REQUEST['display_blob'])) {
        $_SESSION['tmp_user_values']['query'][$sql_key]['display_blob'] = true;
        unset($_REQUEST['display_blob']);
@@ -1727,6 +1751,7 @@ function PMA_displayTable_checkConfigParams()
    $_SESSION['tmp_user_values']['display_text'] = $_SESSION['tmp_user_values']['query'][$sql_key]['display_text'];
    $_SESSION['tmp_user_values']['relational_display'] = $_SESSION['tmp_user_values']['query'][$sql_key]['relational_display'];
    $_SESSION['tmp_user_values']['display_binary'] = isset($_SESSION['tmp_user_values']['query'][$sql_key]['display_binary']) ? true : false;
+    $_SESSION['tmp_user_values']['display_binary_as_hex'] = isset($_SESSION['tmp_user_values']['query'][$sql_key]['display_binary_as_hex']) ? true : false;
    $_SESSION['tmp_user_values']['display_blob'] = isset($_SESSION['tmp_user_values']['query'][$sql_key]['display_blob']) ? true : false;
    $_SESSION['tmp_user_values']['hide_transformation'] = isset($_SESSION['tmp_user_values']['query'][$sql_key]['hide_transformation']) ? true : false;
    $_SESSION['tmp_user_values']['pos'] = $_SESSION['tmp_user_values']['query'][$sql_key]['pos'];
--- a/tbl_change.php
+++ b/tbl_change.php
@@ -438,7 +438,12 @@ foreach ($rows as $row_id => $vrow) {
            } else {
                // loic1: special binary "characters"
                if ($field['is_binary'] || $field['is_blob']) {
-                    $vrow[$field['Field']] = PMA_replace_binary_contents($vrow[$field['Field']]);
+                	if ($_SESSION['tmp_user_values']['display_binary_as_hex'] && $cfg['ShowFunctionFields']) {
+                		$vrow[$field['Field']] = bin2hex($vrow[$field['Field']]);
+                		$field['display_binary_as_hex'] = true;
+					} else {
+                    	$vrow[$field['Field']] = PMA_replace_binary_contents($vrow[$field['Field']]);
+					}
                } // end if
                $special_chars   = htmlspecialchars($vrow[$field['Field']]);

@@ -534,6 +539,10 @@ foreach ($rows as $row_id => $vrow) {
                     $default_function = $cfg['DefaultFunctions']['pk_char36'];
                }
 				
+				if ($field['display_binary_as_hex']) {
+                	$default_function = 'UNHEX';
+				}
+				
                // garvin: loop on the dropdown array and print all available options for that field.
                foreach ($dropdown as $each_dropdown){
                    echo '<option';