Skip to content

Commit 5771a59

Browse files
committed
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.
1 parent f13717c commit 5771a59

File tree

1 file changed

+2
-2
lines changed

1 file changed

+2
-2
lines changed

install/lib/update.lib.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -99,10 +99,10 @@ function updateDbAndIni() {
9999
//** load old data back into database
100100
if( !empty($conf["mysql"]["admin_password"]) ) {
101101

102-
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");
102+
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");
103103
} else {
104104

105-
system("mysql --default-character-set=".$conf['mysql']['charset']." -h '".$conf['mysql']['host']."' -u '".$conf['mysql']['admin_user']."' ".$conf['mysql']['database']." < existing_db.sql");
105+
system("mysql --default-character-set=".$conf['mysql']['charset']." --force -h '".$conf['mysql']['host']."' -u '".$conf['mysql']['admin_user']."' ".$conf['mysql']['database']." < existing_db.sql");
106106
}
107107

108108

0 commit comments

Comments
 (0)