diff --git a/ChangeLog b/ChangeLog index 0ab1244b7..aeceef8ec 100644 --- a/ChangeLog +++ b/ChangeLog @@ -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() diff --git a/lang/afrikaans-utf-8.inc.php b/lang/afrikaans-utf-8.inc.php index b96f1d031..749885a96 100644 --- 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 ?> diff --git a/lang/albanian-utf-8.inc.php b/lang/albanian-utf-8.inc.php index 2c00dade3..03db03918 100644 --- 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 ?> diff --git a/lang/arabic-utf-8.inc.php b/lang/arabic-utf-8.inc.php index bf7bd7b34..5d61b2030 100644 --- 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 ?> diff --git a/lang/azerbaijani-utf-8.inc.php b/lang/azerbaijani-utf-8.inc.php index 2276552b8..ea23e7a93 100644 --- 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 ?> diff --git a/lang/bangla-utf-8.inc.php b/lang/bangla-utf-8.inc.php index ff5592186..6b877447f 100644 --- 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 ?> diff --git a/lang/basque-utf-8.inc.php b/lang/basque-utf-8.inc.php index c52affc36..14b24a689 100644 --- 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 ?> diff --git a/lang/belarusian_cyrillic-utf-8.inc.php b/lang/belarusian_cyrillic-utf-8.inc.php index 5f9fdfeea..6e3de29b0 100644 --- 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 ?> diff --git a/lang/belarusian_latin-utf-8.inc.php b/lang/belarusian_latin-utf-8.inc.php index a0783af61..d8a001d51 100644 --- 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 ?> diff --git a/lang/bosnian-utf-8.inc.php b/lang/bosnian-utf-8.inc.php index c4c647047..c4ad68a72 100644 --- 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 ?> diff --git a/lang/brazilian_portuguese-utf-8.inc.php b/lang/brazilian_portuguese-utf-8.inc.php index 62c2b789e..7cd6d4e1c 100644 --- 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 ?> diff --git a/lang/bulgarian-utf-8.inc.php b/lang/bulgarian-utf-8.inc.php index c8e8047f0..341defb7b 100644 --- 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 ?> diff --git a/lang/catalan-utf-8.inc.php b/lang/catalan-utf-8.inc.php index c5119ba38..a3da713f4 100644 --- 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 ?> diff --git a/lang/chinese_simplified-utf-8.inc.php b/lang/chinese_simplified-utf-8.inc.php index 33fb682d7..238b52ccc 100644 --- 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 ?> diff --git a/lang/chinese_traditional-utf-8.inc.php b/lang/chinese_traditional-utf-8.inc.php index b6b3d6954..8c7def382 100644 --- 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 ?> diff --git a/lang/croatian-utf-8.inc.php b/lang/croatian-utf-8.inc.php index ba1f170c5..5f9727e14 100644 --- 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 ?> diff --git a/lang/czech-utf-8.inc.php b/lang/czech-utf-8.inc.php index 96a5291fc..dbcfd199c 100644 --- a/lang/czech-utf-8.inc.php +++ b/lang/czech-utf-8.inc.php @@ -1609,4 +1609,5 @@ $strSetupZipDumpExportWarning = '[a@?page=form&formset=features#tab_Import_e $strSetupZipDumpImportWarning = '[a@?page=form&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 ?> diff --git a/lang/danish-utf-8.inc.php b/lang/danish-utf-8.inc.php index 6393e5810..8b73da811 100644 --- 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 ?> diff --git a/lang/dutch-utf-8.inc.php b/lang/dutch-utf-8.inc.php index 496f1181c..c65a50f1b 100644 --- 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 ?> diff --git a/lang/english-utf-8.inc.php b/lang/english-utf-8.inc.php index f89cf316e..909d3a820 100644 --- a/lang/english-utf-8.inc.php +++ b/lang/english-utf-8.inc.php @@ -1207,6 +1207,7 @@ $strSetupZipDumpExportWarning = '[a@?page=form&formset=features#tab_Import_e $strSetupZipDumpImportWarning = '[a@?page=form&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'; diff --git a/lang/estonian-utf-8.inc.php b/lang/estonian-utf-8.inc.php index e78422b44..a3a572401 100644 --- 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 ?> diff --git a/lang/finnish-utf-8.inc.php b/lang/finnish-utf-8.inc.php index 76b7b7eba..164308fba 100644 --- 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 ?> diff --git a/lang/french-utf-8.inc.php b/lang/french-utf-8.inc.php index c6969ec84..00e11588c 100644 --- 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 ?> diff --git a/lang/galician-utf-8.inc.php b/lang/galician-utf-8.inc.php index 6cf92b91c..ef573e2a7 100644 --- 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 ?> diff --git a/lang/georgian-utf-8.inc.php b/lang/georgian-utf-8.inc.php index f7dc1ddb5..668f7903f 100644 --- 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 ?> diff --git a/lang/german-utf-8.inc.php b/lang/german-utf-8.inc.php index 61986d74c..879bc70a0 100644 --- 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 ?> diff --git a/lang/greek-utf-8.inc.php b/lang/greek-utf-8.inc.php index e50081472..a74ba4ccb 100644 --- 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 ?> diff --git a/lang/hebrew-utf-8.inc.php b/lang/hebrew-utf-8.inc.php index 8464c78ae..c726737cc 100644 --- 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 ?> diff --git a/lang/hindi-utf-8.inc.php b/lang/hindi-utf-8.inc.php index ddc3369ff..d81f54350 100644 --- 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 ?> diff --git a/lang/hungarian-utf-8.inc.php b/lang/hungarian-utf-8.inc.php index c4a18e9bd..d64707e67 100644 --- 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 ?> diff --git a/lang/indonesian-utf-8.inc.php b/lang/indonesian-utf-8.inc.php index 161f80181..929c31b7d 100644 --- 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 ?> diff --git a/lang/italian-utf-8.inc.php b/lang/italian-utf-8.inc.php index 858fe9b95..d989856ad 100644 --- 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 ?> diff --git a/lang/japanese-utf-8.inc.php b/lang/japanese-utf-8.inc.php index 4a594d32b..8403dd204 100644 --- 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 ?> diff --git a/lang/korean-utf-8.inc.php b/lang/korean-utf-8.inc.php index 4755a4b57..e16f00cde 100644 --- 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 ?> diff --git a/lang/latvian-utf-8.inc.php b/lang/latvian-utf-8.inc.php index ef2fa456f..551e301bd 100644 --- 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 ?> diff --git a/lang/lithuanian-utf-8.inc.php b/lang/lithuanian-utf-8.inc.php index 2da6a6f77..8d02353b1 100644 --- 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 ?> diff --git a/lang/macedonian_cyrillic-utf-8.inc.php b/lang/macedonian_cyrillic-utf-8.inc.php index aeebc13c7..2fd97d77d 100644 --- 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 ?> diff --git a/lang/malay-utf-8.inc.php b/lang/malay-utf-8.inc.php index 4b6c7a11a..b76fc6f0c 100644 --- 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 ?> diff --git a/lang/mongolian-utf-8.inc.php b/lang/mongolian-utf-8.inc.php index a3a0caa70..b0dc0fc83 100644 --- 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 ?> diff --git a/lang/norwegian-utf-8.inc.php b/lang/norwegian-utf-8.inc.php index 29eb1221d..bec587efb 100644 --- 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 ?> diff --git a/lang/persian-utf-8.inc.php b/lang/persian-utf-8.inc.php index 61270eb6f..33b6197ae 100644 --- 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 ?> diff --git a/lang/polish-utf-8.inc.php b/lang/polish-utf-8.inc.php index b5fedecf5..1c8e58133 100644 --- 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 ?> diff --git a/lang/portuguese-utf-8.inc.php b/lang/portuguese-utf-8.inc.php index ce330c295..1dceba118 100644 --- 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 ?> diff --git a/lang/romanian-utf-8.inc.php b/lang/romanian-utf-8.inc.php index 3a137429e..536f10761 100644 --- 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 ?> diff --git a/lang/russian-utf-8.inc.php b/lang/russian-utf-8.inc.php index 8bdc66ccd..1270e661c 100644 --- 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 ?> diff --git a/lang/serbian_cyrillic-utf-8.inc.php b/lang/serbian_cyrillic-utf-8.inc.php index 53d0179d0..9b22db331 100644 --- 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 ?> diff --git a/lang/serbian_latin-utf-8.inc.php b/lang/serbian_latin-utf-8.inc.php index 47c7b6de3..686ea9096 100644 --- 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 ?> diff --git a/lang/sinhala-utf-8.inc.php b/lang/sinhala-utf-8.inc.php index 3da51527a..54f654fac 100644 --- 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 ?> diff --git a/lang/slovak-utf-8.inc.php b/lang/slovak-utf-8.inc.php index 18658b0cc..9b364d236 100644 --- 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 ?> diff --git a/lang/slovenian-utf-8.inc.php b/lang/slovenian-utf-8.inc.php index 246c86510..4ce9ca981 100644 --- 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 ?> diff --git a/lang/spanish-utf-8.inc.php b/lang/spanish-utf-8.inc.php index 146ca109e..271a3a89b 100644 --- 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 ?> diff --git a/lang/swedish-utf-8.inc.php b/lang/swedish-utf-8.inc.php index 6e709cf1c..f0e96e435 100644 --- 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 ?> diff --git a/lang/tatarish-utf-8.inc.php b/lang/tatarish-utf-8.inc.php index b8fb38ec8..86f5d4e94 100644 --- 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 ?> diff --git a/lang/thai-utf-8.inc.php b/lang/thai-utf-8.inc.php index 340346142..abf4bced0 100644 --- 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 ?> diff --git a/lang/turkish-utf-8.inc.php b/lang/turkish-utf-8.inc.php index 5c4d64776..a589ed856 100644 --- 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 ?> diff --git a/lang/ukrainian-utf-8.inc.php b/lang/ukrainian-utf-8.inc.php index d8880eaf6..27035f806 100644 --- 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 ?> diff --git a/lang/uzbek_cyrillic-utf-8.inc.php b/lang/uzbek_cyrillic-utf-8.inc.php index ab7bc62ef..b14126d17 100644 --- 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 ?> diff --git a/lang/uzbek_latin-utf-8.inc.php b/lang/uzbek_latin-utf-8.inc.php index 74477d7d5..ddd402694 100644 --- 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 ?> diff --git a/libraries/display_tbl.lib.php b/libraries/display_tbl.lib.php index 69b61f83d..259471ee3 100644 --- a/libraries/display_tbl.lib.php +++ b/libraries/display_tbl.lib.php @@ -436,6 +436,7 @@ onsubmit="return (checkFormElementInRange(this, 'session_max_rows', ''; PMA_display_html_checkbox('display_blob', $GLOBALS['strShowBLOBContents'], ! empty($_SESSION['tmp_user_values']['display_blob']), false); + echo '
'; + PMA_display_html_checkbox('display_binary_as_hex', $GLOBALS['strShowBinaryContentsAsHex'], ! empty($_SESSION['tmp_user_values']['display_binary_as_hex']), false); echo ''; // 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() @@ -1693,6 +1704,19 @@ function PMA_displayTable_checkConfigParams() // according to low-level field flags $_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; @@ -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']; diff --git a/tbl_change.php b/tbl_change.php index 77cb24cf8..5ccddc64d 100644 --- 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']]); @@ -533,7 +538,11 @@ 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 '