From 1110d087433a67b1a256ae6f5fbdf2cfe4e9856e Mon Sep 17 00:00:00 2001
From: Marc Delisle <marc@infomarc.info>
Date: Sat, 22 Nov 2014 07:13:41 -0500
Subject: [PATCH] bug #4604 Query history not being deleted

Signed-off-by: Marc Delisle <marc@infomarc.info>
---
 ChangeLog                  | 1 +
 libraries/relation.lib.php | 3 +++
 2 files changed, 4 insertions(+)

diff --git a/ChangeLog b/ChangeLog
index 8826855c58..08f2f195c2 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -2,6 +2,7 @@ phpMyAdmin - ChangeLog
 ======================
 
 4.2.13.0 (not yet released)
+- bug #4604 Query history not being deleted
 
 4.2.12.0 (2014-11-20)
 - bug #4574 Blank/white page when JavaScript disabled
diff --git a/libraries/relation.lib.php b/libraries/relation.lib.php
index b550b82896..ba755d6ef5 100644
--- a/libraries/relation.lib.php
+++ b/libraries/relation.lib.php
@@ -935,6 +935,9 @@ function PMA_setHistory($db, $table, $username, $sqlquery)
                NOW(),
                \'' . PMA_Util::sqlAddSlashes($sqlquery) . '\')'
     );
+
+    PMA_purgeHistory($username);
+
 } // end of 'PMA_setHistory()' function
 
 /**