X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=admin%2Fdb%2Fmaintenance_db.inc;h=ad3a32782a2d0fe5ea6232698abe4cbc00dcfc04;hb=f564511bdad01d163c41aa4ec7cc80cc136fa262;hp=6ab542d0397a3f656d033d921fdb512d3a4d7309;hpb=99de4e4d469fd3238d2173f4949dc8c8f9f6bfb7;p=fa-stable.git

diff --git a/admin/db/maintenance_db.inc b/admin/db/maintenance_db.inc
index 6ab542d0..ad3a3278 100644
--- a/admin/db/maintenance_db.inc
+++ b/admin/db/maintenance_db.inc
@@ -304,8 +304,12 @@ function db_import($filename, $connection, $force=true, $init=true, $protect=fal
 
 	$old_encoding = db_get_charset($db);
 
-	ini_set("max_execution_time", "180");
+	ini_set("max_execution_time", max("180", ini_get("max_execution_time")));
 	db_query("SET foreign_key_checks=0");
+
+	if (isset($connection['collation']))
+		db_set_collation($db, $connection['collation']);
+
 	$check_line_len = false;
 
 	// uncompress gziped backup files