From 268628e5ffe7ed2a74d912a43a6e53db186867c2 Mon Sep 17 00:00:00 2001
From: Marc Delisle <marc@infomarc.info>
Date: Fri, 26 Nov 2010 12:46:51 -0500
Subject: [PATCH 1/2] missing title

---
 libraries/header.inc.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/libraries/header.inc.php b/libraries/header.inc.php
index 33531ea6e..6ce37b82b 100644
--- a/libraries/header.inc.php
+++ b/libraries/header.inc.php
@@ -122,7 +122,7 @@ if (!$GLOBALS['is_ajax_request']) {
                             $GLOBALS['cfg']['DefaultTabDatabase'],
                             PMA_generate_common_url($GLOBALS['db']),
                             $GLOBALS['db'],
-                            '',
+                            __('Database'),
                             's_tbl.png');
                     // if the table is being dropped, $_REQUEST['purge'] is set
                     // (it always contains "1")

From fff3afc08e73b1fedafec2490f343bcb3dd541be Mon Sep 17 00:00:00 2001
From: Herman van Rink <rink@initfour.nl>
Date: Fri, 26 Nov 2010 20:55:58 +0100
Subject: [PATCH 2/2] bug #3115519: Prevent long queries from being shown in
 confirmation popup

---
 ChangeLog     | 1 +
 db_search.php | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/ChangeLog b/ChangeLog
index 994b4faf2..d9e6a3446 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -120,6 +120,7 @@
 - bug #3087682 [interface] Do not apply LeftFrameDBSeparator on first character.
 + rfe #3111455 [interface] Column highlighting and marking in table view
 + Visual query builder
+- bug #3115519 [interface] Prevent long queries from being shown in confirmation popup
 
 3.3.9.0 (not yet released)
 - bug [doc] Fix references to MySQL doc
diff --git a/db_search.php b/db_search.php
index 6c87f614b..10a9a1305 100644
--- a/db_search.php
+++ b/db_search.php
@@ -257,7 +257,7 @@ if (isset($_REQUEST['submit_search'])) {
             $this_url_params['sql_query'] = $newsearchsqls['delete'];
             echo '<td>' . PMA_linkOrButton(
                     'sql.php' . PMA_generate_common_url($this_url_params),
-                    __('Delete'), $newsearchsqls['delete']) .  "</td>\n";
+                    __('Delete'), printf(__('Delete the matches for the "%s" table?'), htmlspecialchars($each_table))) .  "</td>\n";
 
         } else {
             echo '<td>&nbsp;</td>' . "\n"