From 2f9e85c8922a3bc1d998745c651fc8ffb84fc754 Mon Sep 17 00:00:00 2001
From: Marc Delisle <marc@infomarc.info>
Date: Mon, 17 Nov 2008 23:13:52 +0000
Subject: [PATCH] bug #2222344 [display] Query involving a function shown as
 binary

---
 ChangeLog                     | 1 +
 libraries/display_tbl.lib.php | 5 +++++
 2 files changed, 6 insertions(+)

diff --git a/ChangeLog b/ChangeLog
index 64c5a85c2..3d47ade70 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -39,6 +39,7 @@ $HeadURL: https://phpmyadmin.svn.sourceforge.net/svnroot/phpmyadmin/trunk/phpMyA
 + [lang] Norwegian update, thanks to Sven-Erik Andersen 
 + [lang] Hungarian update, thanks to Jozsef Tamas Herczeg - dodika 
 + [lang] French update by Marc Delisle - lem9
+- bug #2222344 [display] Query involving a function shown as binary
 
 3.0.2.0 (not yet released)
 - [lang] Italian update, thanks to Luca and fantu
diff --git a/libraries/display_tbl.lib.php b/libraries/display_tbl.lib.php
index d7d9a02ec..2a0cfdaea 100644
--- a/libraries/display_tbl.lib.php
+++ b/libraries/display_tbl.lib.php
@@ -1659,6 +1659,11 @@ function PMA_displayTable_checkConfigParams()
     } elseif (isset($_REQUEST['display_options_form'])) {
         // we know that the checkbox was unchecked
         unset($_SESSION['userconf']['query'][$sql_key]['display_binary']);
+    } else {
+        // selected by default because some operations like OPTIMIZE TABLE
+        // and all queries involving functions return "binary" contents,
+        // according to low-level field flags
+        $_SESSION['userconf']['query'][$sql_key]['display_binary'] = true;
     }
 
     if (isset($_REQUEST['display_blob'])) {