diff --git a/htdocs/lib/mysql.lib.php b/htdocs/lib/mysql.lib.php
index 12fd4be307e..edcbd21333c 100644
--- a/htdocs/lib/mysql.lib.php
+++ b/htdocs/lib/mysql.lib.php
@@ -260,11 +260,15 @@ class DoliDb
     function query($query)
     {
         $query = trim($query);
-        $this->lastquery=$query;
+        $ret = mysql_query($query, $this->db);
+
+        if (! eregi("^COMMIT",$query) && ! eregi("^ROLLBACK",$query)) {
+            // Si requete utilisateur, on la sauvegarde ainsi que son resultset
+            $this->lastquery=$query;
+            $this->results = $ret;
+        }
     
-        $this->results = mysql_query($query, $this->db);
-    
-        return $this->results;
+        return $ret;
     }
     
     /**
diff --git a/htdocs/lib/pgsql.lib.php b/htdocs/lib/pgsql.lib.php
index 19bc38e356c..32bae468229 100644
--- a/htdocs/lib/pgsql.lib.php
+++ b/htdocs/lib/pgsql.lib.php
@@ -271,11 +271,15 @@ class DoliDb
     function query($query)
     {
         $query = trim($query);
-        $this->lastquery=$query;
+        $ret = pg_query($this->db, $query);
+
+        if (! eregi("^COMMIT",$query) && ! eregi("^ROLLBACK",$query)) {
+            // Si requete utilisateur, on la sauvegarde ainsi que son resultset
+            $this->lastquery=$query;
+            $this->results = $ret;
+        }
     
-        $this->results = pg_query($this->db, $query);
-    
-        return $this->results;
+        return $ret;
     }
     
     /**