[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_3_1RC1-1379-g360101d

[Marc Delisle]

The branch, master has been updated
       via  360101dbfb809d2ecd080a836e91f9d2d3a33ea3 (commit)
       via  1f62ea1932a3b4d39cbc64d5b2dcaab81ead78d7 (commit)
       via  44ec2ede9560fdb63d7d61708dfdffd5813869b6 (commit)
      from  97ee9b6754000622219e020e3984042dca1291d5 (commit)


- Log -----------------------------------------------------------------
commit 360101dbfb809d2ecd080a836e91f9d2d3a33ea3
Merge: 97ee9b6754000622219e020e3984042dca1291d5 1f62ea1932a3b4d39cbc64d5b2dcaab81ead78d7
Author: Marc Delisle <marc at infomarc.info>
Date:   Sun Apr 4 17:30:36 2010 -0400

    bug #2973949 SQL History broken (need to revert patch #2899969)

-----------------------------------------------------------------------

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

diff --git a/ChangeLog b/ChangeLog
index d7976e2..a87c0ca 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -77,6 +77,8 @@ $Id$
 - 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 ce9a0d2..16f47ac 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();
-    }
-
     // 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()));


hooks/post-receive
-- 
phpMyAdmin