projects
/
Pman.Core
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
0fa5630
)
mysql/core_cities_merge.sql
author
Edward
<edward@roojs.com>
Fri, 27 Jun 2014 07:27:35 +0000
(15:27 +0800)
committer
Edward
<edward@roojs.com>
Fri, 27 Jun 2014 07:27:35 +0000
(15: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
98d40a5
..
1698d3d
100644
(file)
--- a/
mysql/core_cities_merge.sql
+++ b/
mysql/core_cities_merge.sql
@@
-218,7
+218,7
@@
CREATE FUNCTION core_cities_merge_city() RETURNS INT DETERMINISTIC
IF v_type_tmp = 'RE' THEN
IF v_in_location_tmp != 0 THEN
- SELECT iso INTO v_iso_tmp FROM meta_location WHERE id = v_in_location;
+ SELECT iso INTO v_iso_tmp FROM meta_location WHERE id = v_in_location
_tmp
;
SELECT id INTO v_country_id FROM core_geoip_country WHERE code = v_iso_tmp;