From db334eee0b48922aca0f9fbc1e029490d8aff21a Mon Sep 17 00:00:00 2001 From: Alan Knowles Date: Tue, 24 Feb 2015 16:07:10 +0800 Subject: [PATCH] mysql/core_cities_merge.sql --- mysql/core_cities_merge.sql | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/mysql/core_cities_merge.sql b/mysql/core_cities_merge.sql index edea6899..2ab88a66 100644 --- a/mysql/core_cities_merge.sql +++ b/mysql/core_cities_merge.sql @@ -37,6 +37,7 @@ CREATE FUNCTION core_cities_merge_country() RETURNS INT DETERMINISTIC SET v_count = 0; OPEN co_csr; + co_loop: LOOP FETCH co_csr INTO v_id,v_iso,v_local_name,v_in_location; @@ -261,7 +262,7 @@ CREATE FUNCTION core_cities_merge_city() RETURNS INT DETERMINISTIC DELIMITER ; ------------------------------------------------------------------------------------------------------------------ +-- --------------------------------------------------------------------------------------------------------------- DROP FUNCTION IF EXISTS core_country_locations; @@ -363,7 +364,9 @@ CREATE FUNCTION core_country_blocks() RETURNS INT DETERMINISTIC AND network_start_ip REGEXP '::ffff:[0-9]+.[0-9]+.[0-9]+.[0-9]+$'; - SELECT COUNT(network_start_ip) INTO v_total FROM country_blocks WHERE geoname_id != 0 AND registered_country_geoname_id != 0 AND geoname_id = registered_country_geoname_id AND network_start_ip REGEXP '::ffff:[0-9]+.[0-9]+.[0-9]+.[0-9]+$'; + SELECT COUNT(network_start_ip) INTO v_total FROM country_blocks + WHERE geoname_id != 0 AND registered_country_geoname_id != 0 + AND geoname_id = registered_country_geoname_id AND network_start_ip REGEXP '::ffff:[0-9]+.[0-9]+.[0-9]+.[0-9]+$'; SET v_count = 0; -- 2.39.2