[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_3_1RC1-226-g79ce179

[Marc Delisle]

The branch, master has been updated
       via  79ce179bae4b1b028554df22c16de77f7a73d1f5 (commit)
       via  7a366c3f088cc060b769d56378605c6473b185e8 (commit)
       via  337b2254d85808c5d35df59174250d25a47d5599 (commit)
      from  a6175337a45f3fc2fc27c113c2a6ef1acdd0cbeb (commit)


- Log -----------------------------------------------------------------
commit 79ce179bae4b1b028554df22c16de77f7a73d1f5
Merge: a6175337a45f3fc2fc27c113c2a6ef1acdd0cbeb 7a366c3f088cc060b769d56378605c6473b185e8
Author: Marc Delisle <marc at infomarc.info>
Date:   Sun Mar 14 10:06:24 2010 -0400

    Merge branch 'QA_3_3'

-----------------------------------------------------------------------

Summary of changes:
 ChangeLog                     |    2 ++
 libraries/display_tbl.lib.php |   11 ++++++-----
 2 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 08994a7..6d14838 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -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
   MySQL version, thanks to Dieter Adriaenssens - ruleant
 - 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)
 - bug #2941037 [core] Database structure not sorted by table correctly 
diff --git a/libraries/display_tbl.lib.php b/libraries/display_tbl.lib.php
index 19515f9..acc08c8 100644
--- a/libraries/display_tbl.lib.php
+++ b/libraries/display_tbl.lib.php
@@ -1365,12 +1365,13 @@ function PMA_displayTableBody(&$dt_result, &$is_display, $map, $analyzed_sql) {
                     $field_flags = PMA_DBI_field_flags($dt_result, $i);
                     if (isset($meta->_type) && $meta->_type === MYSQLI_TYPE_BIT) {
                         $row[$i]     = PMA_printable_bit_value($row[$i], $meta->length);
-                    } elseif (stristr($field_flags, 'BINARY') && $meta->type == 'string') {
-                        if ($_SESSION['tmp_user_values']['display_binary'] || (isset($GLOBALS['is_analyse']) && $GLOBALS['is_analyse'])) {
+                        // some results of PROCEDURE ANALYSE() are reported as
+                        // 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
-                            // fields, or we detected a PROCEDURE ANALYSE in
-                            // the query (results are reported as being
-                            // binary strings)
+                            // fields
                             if ($_SESSION['tmp_user_values']['display_binary_as_hex']) {
                             	$row[$i] = bin2hex($row[$i]);
 							}


hooks/post-receive
-- 
phpMyAdmin