mysql/core_cities_merge.sql

diff --git a/mysql/core_cities_merge.sql b/mysql/core_cities_merge.sql
index fdef1b5..0a8bef6 100644 (file)
--- a/mysql/core_cities_merge.sql
+++ b/mysql/core_cities_merge.sql
@@ -472,7 +472,7 @@ CREATE FUNCTION core_city_blocks_mapping()  RETURNS INT DETERMINISTIC
 
         DECLARE csr CURSOR FOR 
         SELECT 
-            geoname_id
+            DISTINCT(geoname_id)
         FROM 
             city_blocks
         WHERE 
@@ -480,7 +480,7 @@ CREATE FUNCTION core_city_blocks_mapping()  RETURNS INT DETERMINISTIC
             AND
                 network_start_ip REGEXP '::ffff:[0-9]+.[0-9]+.[0-9]+.[0-9]+$';
         
-        SELECT COUNT(network_start_ip) INTO v_total FROM city_blocks WHERE geoname_id != 0  AND network_start_ip REGEXP '::ffff:[0-9]+.[0-9]+.[0-9]+.[0-9]+$';
+        SELECT COUNT(DISTINCT(geoname_id)) FROM city_blocks WHERE geoname_id != 0  AND network_start_ip REGEXP '::ffff:[0-9]+.[0-9]+.[0-9]+.[0-9]+$';
 
         SET v_count = 0;