projects
/
Pman.Core
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
686a443
)
mysql/core_cities_merge.sql
author
Edward
<edward@roojs.com>
Thu, 26 Jun 2014 10:16:02 +0000
(18:16 +0800)
committer
Edward
<edward@roojs.com>
Thu, 26 Jun 2014 10:16:02 +0000
(18:16 +0800)
mysql/core_cities_merge.sql
patch
|
blob
|
history
diff --git
a/mysql/core_cities_merge.sql
b/mysql/core_cities_merge.sql
index
60c1d72
..
4b03873
100644
(file)
--- a/
mysql/core_cities_merge.sql
+++ b/
mysql/core_cities_merge.sql
@@
-246,6
+246,8
@@
CREATE FUNCTION core_country_locations() RETURNS INT DETERMINISTIC
DECLARE v_country_iso_code INT DEFAULT 0;
DECLARE v_country_name INT DEFAULT 0;
+ DECLARE v_id INT DEFAULT 0;
+
DECLARE csr CURSOR FOR
SELECT
geoname_id,continent_code,continent_name,country_iso_code,country_name
@@
-262,8
+264,6
@@
CREATE FUNCTION core_country_locations() RETURNS INT DETERMINISTIC
SET v_count = v_count + 1;
- SET v_id_tmp = 0;
-
SELECT id INTO v_id_tmp FROM core_geoip_country WHERE code = v_iso;
IF(v_id_tmp = 0) THEN