From c4c8fcb2b5fbf88fbe6dbcc987fd104d060eac4d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Michal=20=C4=8Ciha=C5=99?= <mcihar@novell.com>
Date: Tue, 14 Jun 2011 08:57:17 +0200
Subject: [PATCH 1/2] Merge changes from master

---
 po/bg.po | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/po/bg.po b/po/bg.po
index 2c2e53b318..b707b2fc19 100644
--- a/po/bg.po
+++ b/po/bg.po
@@ -6547,6 +6547,8 @@ msgid ""
 "Your preferences will be saved for current session only. Storing them "
 "permanently requires %sphpMyAdmin configuration storage%s."
 msgstr ""
+"Вашите настройки ще бъдат пазени само за текущата сесия. За да ги използвате "
+"постоянно е необходимо %sконфигурационно хранилище%s."
 
 #: libraries/user_preferences.lib.php:142
 msgid "Could not save configuration"

From 8cebaca19b08f8faa5eaebfdb2d87c466f274db8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Michal=20=C4=8Ciha=C5=99?= <mcihar@novell.com>
Date: Tue, 14 Jun 2011 09:15:07 +0200
Subject: [PATCH 2/2] bug #3315720 [search] Fix search in non unicode tables

We need to convert field to unicode because the connection is in utf-8
and we might give utf-8 input as well.
---
 ChangeLog     | 1 +
 db_search.php | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/ChangeLog b/ChangeLog
index ee8637270d..2d2d054855 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -9,6 +9,7 @@
 - patch #3311539 [edit] Inline edit does not escape backslashes
 - bug #3313210 [interface] Columns class sometimes changed for nothing
 - patch #3313326 [interface] Some tooltips do not disappear
+- bug #3315720 [search] Fix search in non unicode tables
 
 3.4.2.0 (2011-06-07)
 - bug #3301249 [interface] Iconic table operations does not remove inline edit label
diff --git a/db_search.php b/db_search.php
index fba68d17fe..d93fd74d87 100644
--- a/db_search.php
+++ b/db_search.php
@@ -178,7 +178,7 @@ if (isset($_REQUEST['submit_search'])) {
             $thefieldlikevalue = array();
             foreach ($tblfields as $tblfield) {
                 if (! isset($field) || strlen($field) == 0 || $tblfield == $field) {
-                    $thefieldlikevalue[] = PMA_backquote($tblfield)
+                    $thefieldlikevalue[] = 'CONVERT(' . PMA_backquote($tblfield) . ' USING utf8)'
                                          . ' ' . $like_or_regex . ' '
                                          . "'" . $automatic_wildcard
                                          . $search_word