mysql/core_cities_merge.sql

diff --git a/mysql/core_cities_merge.sql b/mysql/core_cities_merge.sql
index 46353da..ada64e8 100644 (file)
--- a/mysql/core_cities_merge.sql
+++ b/mysql/core_cities_merge.sql
@@ -85,8 +85,6 @@ CREATE FUNCTION core_cities_merge_division()  RETURNS INT DETERMINISTIC
         DECLARE v_country_id INT DEFAULT 0;
         DECLARE v_iso_tmp TEXT DEFAULT '';
         DECLARE v_local_name_tmp TEXT DEFAULT '';
-        DECLARE v_type_tmp TEXT DEFAULT '';
-        DECLARE v_in_location_tmp INT DEFAULT 0;
 
         DECLARE v_division_id INT DEFAULT 0;
 
@@ -112,10 +110,9 @@ CREATE FUNCTION core_cities_merge_division()  RETURNS INT DETERMINISTIC
             SET v_division_id = 0;
             SET v_iso_tmp = '';
             SET v_local_name_tmp = '';
-            SET v_type_tmp = '';
 
             IF v_in_location IS NOT NULL THEN
-                SELECT iso, local_name, type INTO v_iso_tmp, v_local_name_tmp, v_type_tmp FROM meta_location WHERE id = v_in_location;
+                SELECT iso, local_name INTO v_iso_tmp, v_local_name_tmp FROM meta_location WHERE id = v_in_location;
 
                 SELECT id INTO v_country_id FROM core_geoip_country WHERE code = v_iso_tmp;