projects
/
Pman.Core
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
18b181b
)
mysql/core_cities_merge.sql
author
Edward
<edward@roojs.com>
Fri, 27 Jun 2014 07:30:12 +0000
(15:30 +0800)
committer
Edward
<edward@roojs.com>
Fri, 27 Jun 2014 07:30:12 +0000
(15:30 +0800)
mysql/core_cities_merge.sql
patch
|
blob
|
history
diff --git
a/mysql/core_cities_merge.sql
b/mysql/core_cities_merge.sql
index
c1cd8f6
..
edea689
100644
(file)
--- 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;