projects
/
Pman.Core
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
f22b5cd
)
mysql/core_cities_merge.sql
author
Edward
<edward@roojs.com>
Fri, 27 Jun 2014 07:08:52 +0000
(15:08 +0800)
committer
Edward
<edward@roojs.com>
Fri, 27 Jun 2014 07:08:52 +0000
(15:08 +0800)
mysql/core_cities_merge.sql
patch
|
blob
|
history
diff --git
a/mysql/core_cities_merge.sql
b/mysql/core_cities_merge.sql
index
d15e6eb
..
46353da
100644
(file)
--- a/
mysql/core_cities_merge.sql
+++ b/
mysql/core_cities_merge.sql
@@
-114,7
+114,7
@@
CREATE FUNCTION core_cities_merge_division() RETURNS INT DETERMINISTIC
SET v_local_name_tmp = '';
SET v_type_tmp = '';
- IF v_in_location IS NOT NULL
+ IF v_in_location IS NOT NULL
THEN
SELECT iso, local_name, type INTO v_iso_tmp, v_local_name_tmp, v_type_tmp FROM meta_location WHERE id = v_in_location;
SELECT id INTO v_country_id FROM core_geoip_country WHERE code = v_iso_tmp;