X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=admin%2Fdb%2Fmaintenance_db.inc;h=ad3a32782a2d0fe5ea6232698abe4cbc00dcfc04;hb=5ac9ea61baac0cf298b07317051da51e781645b7;hp=6a66ce08046108ce729e6bbea805e1d9bc3d2dae;hpb=17b390efcf904072b02ec866b2a427490471a260;p=fa-stable.git

diff --git a/admin/db/maintenance_db.inc b/admin/db/maintenance_db.inc
index 6a66ce08..ad3a3278 100644
--- a/admin/db/maintenance_db.inc
+++ b/admin/db/maintenance_db.inc
@@ -278,6 +278,8 @@ function db_import($filename, $connection, $force=true, $init=true, $protect=fal
 		"drop table if exists" => 'drop_queries',
 		"drop function if exists" => 'drop_queries',
 		"drop trigger if exists" => 'drop_queries',
+		"select" => 'data_queries', 
+		"delete" => 'data_queries', 
 		);
 
 	$protected = array(
@@ -302,10 +304,15 @@ 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;
-	// uncrompress gziped backup files
+
+	// uncompress gziped backup files
 	if (strpos($filename, ".gz") || strpos($filename, ".GZ"))
 	{	$lines = db_ungzip("lines", $filename);
 		$check_line_len = true;