From 44ec2ede9560fdb63d7d61708dfdffd5813869b6 Mon Sep 17 00:00:00 2001
From: Marc Delisle <marc@infomarc.info>
Date: Sun, 4 Apr 2010 17:04:41 -0400
Subject: [PATCH 1/2] add locale to .gitignore for this branch too

---
 .gitignore | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.gitignore b/.gitignore
index 83fc036dd..8a1aa7419 100644
--- a/.gitignore
+++ b/.gitignore
@@ -20,3 +20,4 @@ phpmyadmin.wpj
 .buildpath
 .cache
 *.sw[op]
+locale

From 1f62ea1932a3b4d39cbc64d5b2dcaab81ead78d7 Mon Sep 17 00:00:00 2001
From: Marc Delisle <marc@infomarc.info>
Date: Sun, 4 Apr 2010 17:21:48 -0400
Subject: [PATCH 2/2] bug #2973949 SQL History broken (need to revert patch
 #2899969)

---
 ChangeLog | 2 ++
 sql.php   | 7 -------
 2 files changed, 2 insertions(+), 7 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index c02f8c989..eb437d122 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -22,6 +22,8 @@ $HeadURL: https://phpmyadmin.svn.sourceforge.net/svnroot/phpmyadmin/trunk/phpMyA
 - patch #2979234, bug #2960105 [import] Properly import unicode text from ODS.
 - bug #2973280 [export] Proper handling of temporary directory in XLS export.
 - bug #2980582 [interface] Properly format server status parameter.
+- bug #2973949 [session] SQL History broken (revert patch #2899969),
+  thanks to Dieter Adriaenssens - ruleant
 
 3.3.1.0 (2010-03-16)
 - bug #2941037 [core] Database structure not sorted by table correctly 
diff --git a/sql.php b/sql.php
index 248ebe3ad..48988603e 100644
--- a/sql.php
+++ b/sql.php
@@ -294,13 +294,6 @@ if (isset($GLOBALS['show_as_php']) || !empty($GLOBALS['validatequery'])) {
         PMA_DBI_query('SET PROFILING=1;');
     }
 
-    // fisharebest: release the session lock, otherwise we won't be able to run other
-    // scripts until the query has finished (which could take a very long time). 
-    // Note: footer.inc.php writes debug info to $_SESSION, so debuggers will have to wait.
-    if (empty($_SESSION['debug'])) {
-        session_write_close();
-    }
-
     // garvin: Measure query time.
     // TODO-Item http://sourceforge.net/tracker/index.php?func=detail&aid=571934&group_id=23067&atid=377411
     $querytime_before = array_sum(explode(' ', microtime()));