diff --git a/htdocs/lib/mysql.lib.php b/htdocs/lib/mysql.lib.php
index 5c45a5697fc..ae421f5fabc 100644
--- a/htdocs/lib/mysql.lib.php
+++ b/htdocs/lib/mysql.lib.php
@@ -223,6 +223,7 @@ class DoliDb
     function create_db($database)
     {
         $ret=$this->query('CREATE DATABASE '.$database);
+        //print "database=".$this->database_name." ret=".$ret." mysqlerror=".mysql_error($this->db);
         return $ret;
     }
         
@@ -334,9 +335,16 @@ class DoliDb
     {
         $query = trim($query);
 
-//        $ret = mysql_query($query, $this->db);
-        $ret = mysql_db_query($this->database_name, $query, $this->db);
-
+        if (! $this->database_name)
+        {
+            // Ordre SQL ne nécessitant pas de connexion ŕ une base (exemple: CREATE DATABASE)
+            $ret = mysql_query($query, $this->db);
+        }
+        else
+        {
+            $ret = mysql_db_query($this->database_name, $query, $this->db);
+        }
+        
         if (! eregi("^COMMIT",$query) && ! eregi("^ROLLBACK",$query)) {
             // Si requete utilisateur, on la sauvegarde ainsi que son resultset
             $this->lastquery=$query;