nettika/phpmyadmin
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'QA_3_3'

Browse Source
This commit is contained in:
Marc Delisle
2010-03-14 10:06:24 -04:00
parent a6175337a4 7a366c3f08
commit 79ce179bae
2 changed files with 8 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
ChangeLog
View File

@@ -54,6 +54,8 @@ $HeadURL: https://phpmyadmin.svn.sourceforge.net/svnroot/phpmyadmin/trunk/phpMyA
- patch #2969449 [core] Name for MERGE engine varies depending on the - patch #2969449 [core] Name for MERGE engine varies depending on the
MySQL version, thanks to Dieter Adriaenssens - ruleant MySQL version, thanks to Dieter Adriaenssens - ruleant
- bug #2966078 [browse] Incorrect LIMIT is saved and sticks while browsing - bug #2966078 [browse] Incorrect LIMIT is saved and sticks while browsing
- bug #2967366 [Structure] Some results of Propose table structure are
shown in hex
3.3.1.0 (not yet released) 3.3.1.0 (not yet released)
- bug #2941037 [core] Database structure not sorted by table correctly - bug #2941037 [core] Database structure not sorted by table correctly

11
libraries/display_tbl.lib.php
View File

@@ -1365,12 +1365,13 @@ function PMA_displayTableBody(&$dt_result, &$is_display, $map, $analyzed_sql) {
$field_flags = PMA_DBI_field_flags($dt_result, $i); $field_flags = PMA_DBI_field_flags($dt_result, $i);
if (isset($meta->_type) && $meta->_type === MYSQLI_TYPE_BIT) { if (isset($meta->_type) && $meta->_type === MYSQLI_TYPE_BIT) {
$row[$i] = PMA_printable_bit_value($row[$i], $meta->length); $row[$i] = PMA_printable_bit_value($row[$i], $meta->length);
} elseif (stristr($field_flags, 'BINARY') && $meta->type == 'string') { // some results of PROCEDURE ANALYSE() are reported as
if ($_SESSION['tmp_user_values']['display_binary'] || (isset($GLOBALS['is_analyse']) && $GLOBALS['is_analyse'])) { // being BINARY but they are quite readable,
// so don't treat them as BINARY
} elseif (stristr($field_flags, 'BINARY') && $meta->type == 'string' && !(isset($GLOBALS['is_analyse']) && $GLOBALS['is_analyse'])) {
if ($_SESSION['tmp_user_values']['display_binary']) {
// user asked to see the real contents of BINARY // user asked to see the real contents of BINARY
// fields, or we detected a PROCEDURE ANALYSE in // fields
// the query (results are reported as being
// binary strings)
if ($_SESSION['tmp_user_values']['display_binary_as_hex']) { if ($_SESSION['tmp_user_values']['display_binary_as_hex']) {
$row[$i] = bin2hex($row[$i]); $row[$i] = bin2hex($row[$i]);
} }