From: Edward <edward@roojs.com>
Date: Fri, 27 Jun 2014 07:30:12 +0000 (+0800)
Subject: mysql/core_cities_merge.sql
X-Git-Url: http://git.roojs.org/?p=Pman.Core;a=commitdiff_plain;h=4eb3e1b01180bb4640adf87bb61adddd7018cd6b

mysql/core_cities_merge.sql
---

diff --git a/mysql/core_cities_merge.sql b/mysql/core_cities_merge.sql
index c1cd8f6d..edea6899 100644
--- a/mysql/core_cities_merge.sql
+++ b/mysql/core_cities_merge.sql
@@ -226,7 +226,7 @@ CREATE FUNCTION core_cities_merge_city()  RETURNS INT DETERMINISTIC
 
                     END IF;
 
-                    SELECT id INTO v_division FROM core_geoip_division WHERE name = v_local_name_tmp AND country_id = v_country_id;
+                    SELECT id INTO v_division_id FROM core_geoip_division WHERE name = v_local_name_tmp AND country_id = v_country_id;
 
                 END IF;