Merge remote-tracking branch 'origin/QA_4_4' into QA_4_4

ChangeLog

@@ -4,6 +4,7 @@ phpMyAdmin - ChangeLog
 4.4.11.0 (not yet released)
 - bug       Missing selected/entered values when editing active options in visual query builder
 - bug #4969 Autoload from prefs_storage not behaving properly
+- bug #4972 Incorrect length computed for binary data
 
 4.4.10.0 (2015-06-17)
 - bug #4950 Issues in database selection for replication

libraries/DisplayResults.class.php

@@ -5126,7 +5126,7 @@ class PMA_DisplayResults
 
         if (isset($content)) {
 
-            $size = /*overload*/mb_strlen($content);
+            $size = /*overload*/mb_strlen($content, '8bit');
             $display_size = PMA_Util::formatByteDown($size, 3, 1);
             $result .= ' - ' . $display_size[0] . ' ' . $display_size[1];
 

tbl_get_field.php

@@ -49,7 +49,7 @@ if ($result === false) {
 PMA_downloadHeader(
     $table . '-' .  $_GET['transform_key'] . '.bin',
     PMA_detectMIME($result),
-    /*overload*/mb_strlen($result)
+    /*overload*/mb_strlen($result, '8bit')
 );
 echo $result;
 ?>