From: Sarah Hoffmann <lonvia@denofr.de>
Date: Sat, 29 Aug 2015 11:16:32 +0000 (+0200)
Subject: Merge remote-tracking branch 'upstream/master'
X-Git-Tag: deploy~435
X-Git-Url: https://git.openstreetmap.org./nominatim.git/commitdiff_plain/5b767a2cc8cbec9df0743d8bb959456fa24a2380?hp=f6b5565db6ed86f353c483f4f5b61a3abaa497d9

Merge remote-tracking branch 'upstream/master'

Conflicts:
	utils/setup.php
---

diff --git a/utils/setup.php b/utils/setup.php
index be422949..0ecf5e6d 100755
--- a/utils/setup.php
+++ b/utils/setup.php
@@ -200,7 +200,7 @@
 			$osm2pgsql .= ' --tablespace-main-data '.CONST_Tablespace_Place_Data;
 		if (CONST_Tablespace_Place_Index)
 			$osm2pgsql .= ' --tablespace-main-index '.CONST_Tablespace_Place_Index;
-		$osm2pgsql .= ' -lsc -O gazetteer --hstore';
+		$osm2pgsql .= ' -lsc -O gazetteer --hstore --number-processes 1';
 		$osm2pgsql .= ' -C 25000';
 		$osm2pgsql .= ' -P '.$aDSNInfo['port'];
 		$osm2pgsql .= ' -d '.$aDSNInfo['database'].' '.$aCMDResult['osm-file'];
diff --git a/utils/update.php b/utils/update.php
index a561aaa3..9ce0f334 100755
--- a/utils/update.php
+++ b/utils/update.php
@@ -82,7 +82,7 @@
 		$iCacheMemory = getCacheMemoryMB();
 		echo "WARNING: resetting cache memory to $iCacheMemory\n";
 	}
-	$sOsm2pgsqlCmd = CONST_Osm2pgsql_Binary.' -klas -C '.$iCacheMemory.' -O gazetteer -d '.$aDSNInfo['database'].' -P '.$aDSNInfo['port'];
+	$sOsm2pgsqlCmd = CONST_Osm2pgsql_Binary.' -klas --number-processes 1 -C '.$iCacheMemory.' -O gazetteer -d '.$aDSNInfo['database'].' -P '.$aDSNInfo['port'];
 	if (!is_null(CONST_Osm2pgsql_Flatnode_File))
 	{
 		$sOsm2pgsqlCmd .= ' --flat-nodes '.CONST_Osm2pgsql_Flatnode_File;