From 5771a59a6ccd63cc0cfd1fe45948e37adeded46b Mon Sep 17 00:00:00 2001
From: tbrehm <t.brehm@ispconfig.org>
Date: Tue, 15 Jun 2010 14:30:07 +0000
Subject: [PATCH] Added --force switch to mysql command when the db dump gets
imported back inti the database so that the import continues even if a
database table is missing.
---
install/lib/update.lib.php | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/install/lib/update.lib.php b/install/lib/update.lib.php
index dece04db2..81f896002 100644
--- a/install/lib/update.lib.php
+++ b/install/lib/update.lib.php
@@ -99,10 +99,10 @@ function updateDbAndIni() {
//** load old data back into database
if( !empty($conf["mysql"]["admin_password"]) ) {
- system("mysql --default-character-set=".$conf['mysql']['charset']." -h '".$conf['mysql']['host']."' -u '".$conf['mysql']['admin_user']."' -p'".$conf['mysql']['admin_password']."' ".$conf['mysql']['database']." < existing_db.sql");
+ system("mysql --default-character-set=".$conf['mysql']['charset']." --force -h '".$conf['mysql']['host']."' -u '".$conf['mysql']['admin_user']."' -p'".$conf['mysql']['admin_password']."' ".$conf['mysql']['database']." < existing_db.sql");
} else {
- system("mysql --default-character-set=".$conf['mysql']['charset']." -h '".$conf['mysql']['host']."' -u '".$conf['mysql']['admin_user']."' ".$conf['mysql']['database']." < existing_db.sql");
+ system("mysql --default-character-set=".$conf['mysql']['charset']." --force -h '".$conf['mysql']['host']."' -u '".$conf['mysql']['admin_user']."' ".$conf['mysql']['database']." < existing_db.sql");
}
--
GitLab