projects
/
Pman.Core
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
mysql/core_cities_merge.sql
[Pman.Core]
/
mysql
/
core_cities_merge.sql
diff --git
a/mysql/core_cities_merge.sql
b/mysql/core_cities_merge.sql
index
269e6d8
..
8cbd1d0
100644
(file)
--- a/
mysql/core_cities_merge.sql
+++ b/
mysql/core_cities_merge.sql
@@
-237,7
+237,6
@@
CREATE FUNCTION core_cities_merge_city() RETURNS INT DETERMINISTIC
SELECT id INTO v_city_id FROM core_geoip_city WHERE name = v_local_name AND country_id = v_country_id AND division_id = v_division_id;
IF(v_city_id = 0) THEN
SELECT id INTO v_city_id FROM core_geoip_city WHERE name = v_local_name AND country_id = v_country_id AND division_id = v_division_id;
IF(v_city_id = 0) THEN
-
INSERT INTO core_geoip_city (name, country_id, division_id) VALUES (v_local_name, v_country_id, v_division_id);
INSERT INTO core_geoip_city (name, country_id, division_id) VALUES (v_local_name, v_country_id, v_division_id);