From: Sarah Hoffmann <lonvia@denofr.de>
Date: Fri, 6 Mar 2015 06:57:20 +0000 (+0100)
Subject: Merge remote-tracking branch 'upstream/master'
X-Git-Tag: deploy~478
X-Git-Url: https://git.openstreetmap.org./nominatim.git/commitdiff_plain/cefa7a3c3bba1e072e1518062da7fd1c1facdc00

Merge remote-tracking branch 'upstream/master'

Conflicts:
	sql/functions.sql
	sql/tables.sql
---

cefa7a3c3bba1e072e1518062da7fd1c1facdc00
diff --cc sql/tables.sql
index 428eadc2,9126c629..dcee4070
--- a/sql/tables.sql
+++ b/sql/tables.sql
@@@ -41,7 -53,12 +41,9 @@@ GRANT INSERT ON new_query_log TO "{www-
  GRANT UPDATE ON new_query_log TO "{www-user}" ;
  GRANT SELECT ON new_query_log TO "{www-user}" ;
  
+ GRANT SELECT ON TABLE country_name TO "{www-user}";
+ GRANT SELECT ON TABLE gb_postcode TO "{www-user}";
  
 -create view vw_search_query_log as SELECT substr(query, 1, 50) AS query, starttime, endtime - starttime AS duration, substr(useragent, 1, 20) as 
 -useragent, language, results, ipaddress FROM new_query_log WHERE type = 'search' ORDER BY starttime DESC;
 -
  drop table IF EXISTS word;
  CREATE TABLE word (
    word_id INTEGER,