projects
/
Pman.Core
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
d8fb218
)
mysql/core_cities_merge.sql
author
Edward
<edward@roojs.com>
Thu, 26 Jun 2014 10:27:39 +0000
(18:27 +0800)
committer
Edward
<edward@roojs.com>
Thu, 26 Jun 2014 10:27:39 +0000
(18:27 +0800)
mysql/core_cities_merge.sql
patch
|
blob
|
history
diff --git
a/mysql/core_cities_merge.sql
b/mysql/core_cities_merge.sql
index
b592532
..
76e595a
100644
(file)
--- a/
mysql/core_cities_merge.sql
+++ b/
mysql/core_cities_merge.sql
@@
-279,7
+279,7
@@
CREATE FUNCTION core_country_locations() RETURNS INT DETERMINISTIC
END IF;
IF (v_country_iso_code != '') THEN
- RETURN v_
country_iso_code
;
+ RETURN v_
geoname_id
;
SELECT id INTO v_country_id FROM core_geoip_country WHERE code = v_country_iso_code;
IF v_continent_id = 0 THEN