tbrehm
2010-06-15 5771a59a6ccd63cc0cfd1fe45948e37adeded46b
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 files modified
4 ■■■■ changed files
install/lib/update.lib.php 4 ●●●● patch | view | raw | blame | history
install/lib/update.lib.php
@@ -99,10 +99,10 @@
    //** 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");
    }