From adee9be958cc89d23329807cc2dfbe76e647b83d Mon Sep 17 00:00:00 2001 From: Janusz Dobrowolski Date: Sun, 3 May 2009 13:47:41 +0000 Subject: [PATCH] Enabled drop table queries during non-forced upgrade. --- admin/db/maintenance_db.inc | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/admin/db/maintenance_db.inc b/admin/db/maintenance_db.inc index 29790b66..a4f6157f 100644 --- a/admin/db/maintenance_db.inc +++ b/admin/db/maintenance_db.inc @@ -117,7 +117,8 @@ function db_drop_db($connection) function db_import($filename, $connection, $force=true) { - global $db; + global $db, $go_debug; + $allowed_commands = array( "create" => 'table_queries', "alter table" => 'table_queries', @@ -191,13 +192,13 @@ function db_import($filename, $connection, $force=true) } */ // execute drop tables if exists queries - if ($force && is_array($drop_queries)) + if (is_array($drop_queries)) { foreach($drop_queries as $drop_query) { if (!db_query($drop_query[0])) { - if (!in_array(db_error_no(), $ignored_mysql_errors)) + if (!in_array(db_error_no(), $ignored_mysql_errors) || !$force) $sql_errors[] = array(db_error_msg($db), $drop_query[1]); } } -- 2.30.2