diff --git a/ChangeLog b/ChangeLog index eec8fb8be..888316417 100644 --- a/ChangeLog +++ b/ChangeLog @@ -23,6 +23,7 @@ $HeadURL: https://phpmyadmin.svn.sourceforge.net/svnroot/phpmyadmin/trunk/phpMyA - bug #1614004 [relation] foreign key spanning multiple columns are incorrectly displayed - bug #1681598 [interface] Edit next row +- bug #1688053 [export] Wrong export of binary character fields + [core] added PMA_fatalError() and made use of it . [core] added PMA_isValid() and PMA_ifSetOr() for variable handling . [i18n] use generic $strOptions diff --git a/libraries/export/sql.php b/libraries/export/sql.php index 21d18c167..c19aa47d0 100644 --- a/libraries/export/sql.php +++ b/libraries/export/sql.php @@ -844,7 +844,12 @@ function PMA_exportData($db, $table, $crlf, $error_url, $sql_query) if (empty($row[$j]) && $row[$j] != '0') { $values[] = '\'\''; } else { - $values[] = '0x' . bin2hex($row[$j]); + if ($fields_meta[$j]->blob) { + $values[] = '0x' . bin2hex($row[$j]); + // to support for example a latin1_bin + } else { + $values[] = 'CONVERT(0x' . bin2hex($row[$j]) . ' USING UTF8)'; + } } // something else -> treat as a string } else {