From af07a208c85ee539f2462a8c1af4747d163c2854 Mon Sep 17 00:00:00 2001
From: Atul Pratap Singh <atulpratapsingh05@gmail.com>
Date: Sat, 13 Oct 2012 12:44:29 +0530
Subject: [PATCH 1/2] Fix bug #3576322 -Invalid select statement in case of
 ENUM fields

---
 js/tbl_select.js             | 3 +--
 libraries/tbl_select.lib.php | 4 ++--
 2 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/js/tbl_select.js b/js/tbl_select.js
index 7658eaf5bd..1067ab05bf 100644
--- a/js/tbl_select.js
+++ b/js/tbl_select.js
@@ -78,8 +78,7 @@ $(document).ready(function() {
             if ($.inArray(values['func[' + a + ']'], unaryFunctions) >= 0) {
                 continue;
             }
-
-            if (values['fields[' + a + ']'] == '') {
+            if (values['fields[' + a + ']'] == '' || values['fields[' + a + ']'] == null) {
                 delete values['fields[' + a + ']'];
                 delete values['func[' + a + ']'];
                 delete values['names[' + a + ']'];
diff --git a/libraries/tbl_select.lib.php b/libraries/tbl_select.lib.php
index 14adf13d94..8a5bc308ab 100644
--- a/libraries/tbl_select.lib.php
+++ b/libraries/tbl_select.lib.php
@@ -195,9 +195,9 @@ EOT;
         if ((strncasecmp($tbl_fields_type[$i], 'enum', 4) && ! $in_zoom_search_edit)
             || (strncasecmp($tbl_fields_type[$i], 'set', 3) && $in_zoom_search_edit)
         ) {
-            $str .= '<select name="fields[' . ($i) . '][]" id="fieldID_' . $i .'">' . "\n";
+            $str .= '<select name="fields[' . ($i) . ']" id="fieldID_' . $i .'">' . "\n";
         } else {
-            $str .= '<select name="fields[' . ($i) . '][]" id="fieldID_' . $i .'"'
+            $str .= '<select name="fields[' . ($i) . ']" id="fieldID_' . $i .'"'
                 . ' multiple="multiple" size="' . min(3, $cnt_value) . '">' . "\n";
         }
 

From 4164cd8dc100b51fd85054a9419c77f7f708aa14 Mon Sep 17 00:00:00 2001
From: Atul Pratap Singh <atulpratapsingh05@gmail.com>
Date: Sat, 13 Oct 2012 13:23:03 +0530
Subject: [PATCH 2/2] Changelog entry for bug #3576322

---
 ChangeLog | 1 +
 1 file changed, 1 insertion(+)

diff --git a/ChangeLog b/ChangeLog
index f55c53464d..f749973242 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -5,6 +5,7 @@ phpMyAdmin - ChangeLog
 - bug #3570212 [edit] uuid_short() is a no-arguments function
 - bug #3569577 [edit] Add routine parameter headers not valid for "function" 
 - bug #3575799 [search] Various search operators not working as expected
+- bug #3576322 [search] Invalid select query generated for tables with ENUM fields
 
 3.5.3.0 (2012-10-08)
 - bug #3539044 [interface] Browse mode "Show" button gives blank page if no results anymore