projects
/
fa-stable.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Improved layout.
[fa-stable.git]
/
admin
/
db
/
maintenance_db.inc
diff --git
a/admin/db/maintenance_db.inc
b/admin/db/maintenance_db.inc
index 29790b6658ad29bebd26aa92dbd8d7fae718c479..a4f6157fb8ca85f1b9a142dfa1909c82c289c0fc 100644
(file)
--- 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)
{
function db_import($filename, $connection, $force=true)
{
- global $db;
+ global $db, $go_debug;
+
$allowed_commands = array(
"create" => 'table_queries',
"alter table" => 'table_queries',
$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
}
*/
// 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]))
{
{
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]);
}
}
$sql_errors[] = array(db_error_msg($db), $drop_query[1]);
}
}