Merged changes from stable branch up to 2.3.12

[fa-stable.git] / includes / db / connect_db.inc

diff --git a/includes/db/connect_db.inc b/includes/db/connect_db.inc
index ecd84249fbc221261064df883354b6ebce3163a6..ec9e3816fa9d05323df237ad206efb2f9e65a81b 100644 (file)
--- a/includes/db/connect_db.inc
+++ b/includes/db/connect_db.inc
@@ -295,7 +295,7 @@ function db_create_db($connection)
                $connection["dbuser"], $connection["dbpassword"]);
        if (!mysql_select_db($connection["dbname"], $db))
        {
-               $sql = "CREATE DATABASE " . $connection["dbname"] . " COLLATE ".get_mysql_collation();
+               $sql = "CREATE DATABASE IF NOT EXISTS " . $connection["dbname"] . " COLLATE ".get_mysql_collation();
 
                if (!mysql_query($sql) || !mysql_select_db($connection["dbname"], $db))
                        return 0;
@@ -308,7 +308,7 @@ function db_drop_db($connection)
 
        if ($connection["tbpref"] == "")
        {
-               $sql = "DROP DATABASE " . $connection["dbname"] . "";
+               $sql = "DROP DATABASE IF EXISTS " . $connection["dbname"] . "";
                return mysql_query($sql);
        }
        else