diff --git a/bin/db_pendings/import.sh b/bin/db_pendings/import.sh
index 970d76283..6e16396e2 100755
--- a/bin/db_pendings/import.sh
+++ b/bin/db_pendings/import.sh
@@ -79,9 +79,11 @@ function import() {
             echo "--" >> "$newFile";
             echo "-- START UPDATING QUERIES" >> "$newFile";
             echo "--" >> "$newFile";
+            echo "" >> "$newFile";
 
             cat $entry >> "$newFile";
 
+            echo "" >> "$newFile";
             echo "--" >> "$newFile";
             echo "-- END UPDATING QUERIES" >> "$newFile";
             echo "--" >> "$newFile";
diff --git a/data/sql/updates/db_auth/2016_11_18_00.sql b/data/sql/updates/db_auth/2016_11_18_00.sql
index 86c846397..4db79713b 100644
--- a/data/sql/updates/db_auth/2016_11_18_00.sql
+++ b/data/sql/updates/db_auth/2016_11_18_00.sql
@@ -15,8 +15,7 @@ ALTER TABLE version_db_auth CHANGE COLUMN 2016_09_04_00 2016_11_18_00 bit;
 --
 
 COMMIT;
-END;
-//
+END //
 DELIMITER ;
 CALL updateDb();
 DROP PROCEDURE IF EXISTS `updateDb`;
diff --git a/data/sql/updates/db_auth/2016_11_19_00.sql b/data/sql/updates/db_auth/2016_11_19_00.sql
index fb6172477..ce1003ba6 100644
--- a/data/sql/updates/db_auth/2016_11_19_00.sql
+++ b/data/sql/updates/db_auth/2016_11_19_00.sql
@@ -26,8 +26,7 @@ ALTER TABLE `account`
 -- END UPDATING QUERIES
 --
 COMMIT;
-END;
-//
+END //
 DELIMITER ;
 CALL updateDb();
 DROP PROCEDURE IF EXISTS `updateDb`;
diff --git a/data/sql/updates/db_auth/2017_08_19_00.sql b/data/sql/updates/db_auth/2017_08_19_00.sql
index 82afc2238..7ec7a6252 100644
--- a/data/sql/updates/db_auth/2017_08_19_00.sql
+++ b/data/sql/updates/db_auth/2017_08_19_00.sql
@@ -22,8 +22,7 @@ ALTER TABLE `account` CHANGE `expansion` `expansion` TINYINT(3) UNSIGNED DEFAULT
 -- END UPDATING QUERIES
 --
 COMMIT;
-END;
-//
+END //
 DELIMITER ;
 CALL updateDb();
 DROP PROCEDURE IF EXISTS `updateDb`;
diff --git a/data/sql/updates/db_auth/2017_08_20_01.sql b/data/sql/updates/db_auth/2017_08_20_01.sql
index 84597197a..12b09a746 100644
--- a/data/sql/updates/db_auth/2017_08_20_01.sql
+++ b/data/sql/updates/db_auth/2017_08_20_01.sql
@@ -38,8 +38,7 @@ CREATE TABLE `ip2nationCountries` (
 -- END UPDATING QUERIES
 --
 COMMIT;
-END;
-//
+END //
 DELIMITER ;
 CALL updateDb();
 DROP PROCEDURE IF EXISTS `updateDb`;
diff --git a/data/sql/updates/db_characters/2016_11_18_00.sql b/data/sql/updates/db_characters/2016_11_18_00.sql
index 587cd291d..306aab53c 100644
--- a/data/sql/updates/db_characters/2016_11_18_00.sql
+++ b/data/sql/updates/db_characters/2016_11_18_00.sql
@@ -15,8 +15,7 @@ ALTER TABLE version_db_characters CHANGE COLUMN 2016_08_25_00 2016_11_18_00 bit;
 --
 
 COMMIT;
-END;
-//
+END //
 DELIMITER ;
 CALL updateDb();
 DROP PROCEDURE IF EXISTS `updateDb`;
diff --git a/data/sql/updates/db_characters/2016_11_19_00.sql b/data/sql/updates/db_characters/2016_11_19_00.sql
index dc9722fc9..d4d082b00 100644
--- a/data/sql/updates/db_characters/2016_11_19_00.sql
+++ b/data/sql/updates/db_characters/2016_11_19_00.sql
@@ -22,8 +22,7 @@ ALTER TABLE `arena_team_member`
 -- END UPDATING QUERIES
 --
 COMMIT;
-END;
-//
+END //
 DELIMITER ;
 CALL updateDb();
 DROP PROCEDURE IF EXISTS `updateDb`;
diff --git a/data/sql/updates/db_characters/2017_09_18_00.sql b/data/sql/updates/db_characters/2017_09_18_00.sql
index 19b71d4fd..c25a8537b 100644
--- a/data/sql/updates/db_characters/2017_09_18_00.sql
+++ b/data/sql/updates/db_characters/2017_09_18_00.sql
@@ -41,8 +41,7 @@ CREATE TABLE `banned_addons` (
 -- END UPDATING QUERIES
 --
 COMMIT;
-END;
-//
+END //
 DELIMITER ;
 CALL updateDb();
 DROP PROCEDURE IF EXISTS `updateDb`;
diff --git a/data/sql/updates/db_world/2016_11_18_00.sql b/data/sql/updates/db_world/2016_11_18_00.sql
index 6e3b5091d..ae80b7e0a 100644
--- a/data/sql/updates/db_world/2016_11_18_00.sql
+++ b/data/sql/updates/db_world/2016_11_18_00.sql
@@ -16,8 +16,7 @@ ALTER TABLE version_db_world CHANGE COLUMN 2016_11_06_02 2016_11_18_00 bit;
 --
 
 COMMIT;
-END;
-//
+END //
 DELIMITER ;
 CALL updateDb();
 DROP PROCEDURE IF EXISTS `updateDb`;
diff --git a/data/sql/updates/db_world/2016_11_19_00.sql b/data/sql/updates/db_world/2016_11_19_00.sql
index 614bca34d..4b41d548b 100644
--- a/data/sql/updates/db_world/2016_11_19_00.sql
+++ b/data/sql/updates/db_world/2016_11_19_00.sql
@@ -20,8 +20,7 @@ UPDATE `quest_template` SET `SpecialFlags` = "0", `RequiredItemId1` = "31811", `
 -- END UPDATING QUERIES
 --
 COMMIT;
-END;
-//
+END //
 DELIMITER ;
 CALL updateDb();
 DROP PROCEDURE IF EXISTS `updateDb`;
diff --git a/data/sql/updates/db_world/2016_11_26_00.sql b/data/sql/updates/db_world/2016_11_26_00.sql
index ec0eb6c22..afa22b78b 100644
--- a/data/sql/updates/db_world/2016_11_26_00.sql
+++ b/data/sql/updates/db_world/2016_11_26_00.sql
@@ -23,8 +23,7 @@ INSERT INTO trinity_string(`entry`,`content_default`,`content_loc6`,`content_loc
 -- END UPDATING QUERIES
 --
 COMMIT;
-END;
-//
+END //
 DELIMITER ;
 CALL updateDb();
 DROP PROCEDURE IF EXISTS `updateDb`;
diff --git a/data/sql/updates/db_world/2016_11_26_01.sql b/data/sql/updates/db_world/2016_11_26_01.sql
index 5dfc29629..d903dea90 100644
--- a/data/sql/updates/db_world/2016_11_26_01.sql
+++ b/data/sql/updates/db_world/2016_11_26_01.sql
@@ -63,8 +63,7 @@ ALTER TABLE `gameobject_template` DROP `questItem1`, DROP `questItem2`, DROP `qu
 -- END UPDATING QUERIES
 --
 COMMIT;
-END;
-//
+END //
 DELIMITER ;
 CALL updateDb();
 DROP PROCEDURE IF EXISTS `updateDb`;
diff --git a/data/sql/updates/db_world/2016_12_02_00.sql b/data/sql/updates/db_world/2016_12_02_00.sql
index 1ffbc6b98..2e87b2c40 100644
--- a/data/sql/updates/db_world/2016_12_02_00.sql
+++ b/data/sql/updates/db_world/2016_12_02_00.sql
@@ -12398,8 +12398,7 @@ UPDATE `creature_text` SET `BroadcastTextID`='8388' WHERE `entry`=4489 AND `grou
 UPDATE `creature_text` SET `BroadcastTextID`='8393' WHERE `entry`=4489 AND `groupid`=4 AND `id`=0;
 
 COMMIT;
-END;
-//
+END //
 DELIMITER ;
 CALL updateDb();
 DROP PROCEDURE IF EXISTS `updateDb`;
diff --git a/data/sql/updates/db_world/2017_01_24_00.sql b/data/sql/updates/db_world/2017_01_24_00.sql
index 6abae0204..42ff301ed 100644
--- a/data/sql/updates/db_world/2017_01_24_00.sql
+++ b/data/sql/updates/db_world/2017_01_24_00.sql
@@ -20,8 +20,7 @@ UPDATE `creature_text` SET `text` = "$N! I'm watching you!" WHERE `entry` = "113
 -- END UPDATING QUERIES
 --
 COMMIT;
-END;
-//
+END //
 DELIMITER ;
 CALL updateDb();
 DROP PROCEDURE IF EXISTS `updateDb`;
diff --git a/data/sql/updates/db_world/2017_01_24_01.sql b/data/sql/updates/db_world/2017_01_24_01.sql
index e036ec3cb..8f0ee9145 100644
--- a/data/sql/updates/db_world/2017_01_24_01.sql
+++ b/data/sql/updates/db_world/2017_01_24_01.sql
@@ -25,8 +25,7 @@ INSERT INTO `smart_scripts` (`entryorguid`, `source_type`, `id`, `link`, `event_
 -- END UPDATING QUERIES
 --
 COMMIT;
-END;
-//
+END //
 DELIMITER ;
 CALL updateDb();
 DROP PROCEDURE IF EXISTS `updateDb`;
diff --git a/data/sql/updates/db_world/2017_01_24_02.sql b/data/sql/updates/db_world/2017_01_24_02.sql
index ce3f96084..bc8a7d46e 100644
--- a/data/sql/updates/db_world/2017_01_24_02.sql
+++ b/data/sql/updates/db_world/2017_01_24_02.sql
@@ -72,8 +72,7 @@ ALTER TABLE `quest_template`
 -- END UPDATING QUERIES
 --
 COMMIT;
-END;
-//
+END //
 DELIMITER ;
 CALL updateDb();
 DROP PROCEDURE IF EXISTS `updateDb`;
diff --git a/data/sql/updates/db_world/2017_01_24_03.sql b/data/sql/updates/db_world/2017_01_24_03.sql
index c10cf5941..2e98dda4b 100644
--- a/data/sql/updates/db_world/2017_01_24_03.sql
+++ b/data/sql/updates/db_world/2017_01_24_03.sql
@@ -19,8 +19,7 @@ DELETE FROM `disables` WHERE `entry` = "532";--
 -- END UPDATING QUERIES
 --
 COMMIT;
-END;
-//
+END //
 DELIMITER ;
 CALL updateDb();
 DROP PROCEDURE IF EXISTS `updateDb`;
diff --git a/data/sql/updates/db_world/2017_01_24_04.sql b/data/sql/updates/db_world/2017_01_24_04.sql
index fb44848f7..d23749d4c 100644
--- a/data/sql/updates/db_world/2017_01_24_04.sql
+++ b/data/sql/updates/db_world/2017_01_24_04.sql
@@ -51,8 +51,7 @@ ALTER TABLE `quest_template`
 -- END UPDATING QUERIES
 --
 COMMIT;
-END;
-//
+END //
 DELIMITER ;
 CALL updateDb();
 DROP PROCEDURE IF EXISTS `updateDb`;
diff --git a/data/sql/updates/db_world/2017_01_24_05.sql b/data/sql/updates/db_world/2017_01_24_05.sql
index d3d8560a1..cd071978a 100644
--- a/data/sql/updates/db_world/2017_01_24_05.sql
+++ b/data/sql/updates/db_world/2017_01_24_05.sql
@@ -29,8 +29,7 @@ INSERT INTO `creature` (`guid`, `id`, `map`, `spawnMask`, `phaseMask`, `modelid`
 -- END UPDATING QUERIES
 --
 COMMIT;
-END;
-//
+END //
 DELIMITER ;
 CALL updateDb();
 DROP PROCEDURE IF EXISTS `updateDb`;
diff --git a/data/sql/updates/db_world/2017_01_24_06.sql b/data/sql/updates/db_world/2017_01_24_06.sql
index 26f5f639d..7cdbdc449 100644
--- a/data/sql/updates/db_world/2017_01_24_06.sql
+++ b/data/sql/updates/db_world/2017_01_24_06.sql
@@ -82,8 +82,7 @@ INSERT INTO `waypoints` (`entry`,`pointid`,`position_x`,`position_y`,`position_z
 -- END UPDATING QUERIES
 --
 COMMIT;
-END;
-//
+END //
 DELIMITER ;
 CALL updateDb();
 DROP PROCEDURE IF EXISTS `updateDb`;
diff --git a/data/sql/updates/db_world/2017_02_03_00.sql b/data/sql/updates/db_world/2017_02_03_00.sql
index 4cbcd6ba5..2b5da6dfc 100644
--- a/data/sql/updates/db_world/2017_02_03_00.sql
+++ b/data/sql/updates/db_world/2017_02_03_00.sql
@@ -19,8 +19,7 @@ UPDATE `creature` SET `MovementType` = 1, `spawndist` = 10  WHERE `guid` IN (197
 -- END UPDATING QUERIES
 --
 COMMIT;
-END;
-//
+END //
 DELIMITER ;
 CALL updateDb();
 DROP PROCEDURE IF EXISTS `updateDb`;
diff --git a/data/sql/updates/db_world/2017_02_03_01.sql b/data/sql/updates/db_world/2017_02_03_01.sql
index 411cabea8..12ec44437 100644
--- a/data/sql/updates/db_world/2017_02_03_01.sql
+++ b/data/sql/updates/db_world/2017_02_03_01.sql
@@ -21,8 +21,7 @@ INSERT INTO `disables` (`sourceType`,`entry`,`flags`,`params_0`,`params_1`,`comm
 -- END UPDATING QUERIES
 --
 COMMIT;
-END;
-//
+END //
 DELIMITER ;
 CALL updateDb();
 DROP PROCEDURE IF EXISTS `updateDb`;
diff --git a/data/sql/updates/db_world/2017_02_03_02.sql b/data/sql/updates/db_world/2017_02_03_02.sql
index f0ddc25de..d505d2bf1 100644
--- a/data/sql/updates/db_world/2017_02_03_02.sql
+++ b/data/sql/updates/db_world/2017_02_03_02.sql
@@ -29,8 +29,7 @@ INSERT INTO `conditions` (`SourceTypeOrReferenceId`, `SourceGroup`, `SourceEntry
 -- END UPDATING QUERIES
 --
 COMMIT;
-END;
-//
+END //
 DELIMITER ;
 CALL updateDb();
 DROP PROCEDURE IF EXISTS `updateDb`;
diff --git a/data/sql/updates/db_world/2017_02_03_03.sql b/data/sql/updates/db_world/2017_02_03_03.sql
index fe44fb5ec..e70ca064f 100644
--- a/data/sql/updates/db_world/2017_02_03_03.sql
+++ b/data/sql/updates/db_world/2017_02_03_03.sql
@@ -77,8 +77,7 @@ INSERT INTO `creature_text` (`entry`, `groupid`, `id`, `text`, `type`, `language
 -- END UPDATING QUERIES
 --
 COMMIT;
-END;
-//
+END //
 DELIMITER ;
 CALL updateDb();
 DROP PROCEDURE IF EXISTS `updateDb`;
diff --git a/data/sql/updates/db_world/2017_02_03_04.sql b/data/sql/updates/db_world/2017_02_03_04.sql
index 410167122..74f174262 100644
--- a/data/sql/updates/db_world/2017_02_03_04.sql
+++ b/data/sql/updates/db_world/2017_02_03_04.sql
@@ -149,8 +149,7 @@ INSERT INTO `waypoints` (`entry`, `pointid`, `position_x`, `position_y`, `positi
 -- END UPDATING QUERIES
 --
 COMMIT;
-END;
-//
+END //
 DELIMITER ;
 CALL updateDb();
 DROP PROCEDURE IF EXISTS `updateDb`;
diff --git a/data/sql/updates/db_world/2017_02_03_05.sql b/data/sql/updates/db_world/2017_02_03_05.sql
index b0f2452fb..5bda6976b 100644
--- a/data/sql/updates/db_world/2017_02_03_05.sql
+++ b/data/sql/updates/db_world/2017_02_03_05.sql
@@ -130,8 +130,7 @@ UPDATE `waypoint_data` SET `action_chance`=100 WHERE `action` IN (@SCRIPTID);
 -- END UPDATING QUERIES
 --
 COMMIT;
-END;
-//
+END //
 DELIMITER ;
 CALL updateDb();
 DROP PROCEDURE IF EXISTS `updateDb`;
diff --git a/data/sql/updates/db_world/2017_02_03_06.sql b/data/sql/updates/db_world/2017_02_03_06.sql
index a3b20e0b1..dd4d3072b 100644
--- a/data/sql/updates/db_world/2017_02_03_06.sql
+++ b/data/sql/updates/db_world/2017_02_03_06.sql
@@ -24,8 +24,7 @@ INSERT INTO `smart_scripts` (`entryorguid`,`source_type`,`id`,`link`,`event_type
 -- END UPDATING QUERIES
 --
 COMMIT;
-END;
-//
+END //
 DELIMITER ;
 CALL updateDb();
 DROP PROCEDURE IF EXISTS `updateDb`;
diff --git a/data/sql/updates/db_world/2017_02_03_07.sql b/data/sql/updates/db_world/2017_02_03_07.sql
index 5b6c52454..c5d36ef27 100644
--- a/data/sql/updates/db_world/2017_02_03_07.sql
+++ b/data/sql/updates/db_world/2017_02_03_07.sql
@@ -58,8 +58,7 @@ INSERT INTO `creature_text` (`entry`, `groupid`, `id`, `text`, `type`, `language
 -- END UPDATING QUERIES
 --
 COMMIT;
-END;
-//
+END //
 DELIMITER ;
 CALL updateDb();
 DROP PROCEDURE IF EXISTS `updateDb`;
diff --git a/data/sql/updates/db_world/2017_02_03_08.sql b/data/sql/updates/db_world/2017_02_03_08.sql
index 99ca6a503..208a3ceb2 100644
--- a/data/sql/updates/db_world/2017_02_03_08.sql
+++ b/data/sql/updates/db_world/2017_02_03_08.sql
@@ -45,8 +45,7 @@ INSERT INTO `smart_scripts` (`entryorguid`,`source_type`,`id`,`link`,`event_type
 -- END UPDATING QUERIES
 --
 COMMIT;
-END;
-//
+END //
 DELIMITER ;
 CALL updateDb();
 DROP PROCEDURE IF EXISTS `updateDb`;
diff --git a/data/sql/updates/db_world/2017_02_03_09.sql b/data/sql/updates/db_world/2017_02_03_09.sql
index 7cddaa255..935ca7ff8 100644
--- a/data/sql/updates/db_world/2017_02_03_09.sql
+++ b/data/sql/updates/db_world/2017_02_03_09.sql
@@ -116,8 +116,7 @@ INSERT INTO `waypoints` (`entry`, `pointid`, `position_x`, `position_y`, `positi
 -- END UPDATING QUERIES
 --
 COMMIT;
-END;
-//
+END //
 DELIMITER ;
 CALL updateDb();
 DROP PROCEDURE IF EXISTS `updateDb`;
diff --git a/data/sql/updates/db_world/2017_02_03_10.sql b/data/sql/updates/db_world/2017_02_03_10.sql
index 9598c821c..06721f397 100644
--- a/data/sql/updates/db_world/2017_02_03_10.sql
+++ b/data/sql/updates/db_world/2017_02_03_10.sql
@@ -53,8 +53,7 @@ INSERT INTO `waypoints` (`entry`, `pointid`, `position_x`, `position_y`, `positi
 -- END UPDATING QUERIES
 --
 COMMIT;
-END;
-//
+END //
 DELIMITER ;
 CALL updateDb();
 DROP PROCEDURE IF EXISTS `updateDb`;
diff --git a/data/sql/updates/db_world/2017_02_03_11.sql b/data/sql/updates/db_world/2017_02_03_11.sql
index 73291503d..f5cec8fa6 100644
--- a/data/sql/updates/db_world/2017_02_03_11.sql
+++ b/data/sql/updates/db_world/2017_02_03_11.sql
@@ -46,8 +46,7 @@ INSERT INTO `waypoints` (`entry`, `pointid`, `position_x`, `position_y`, `positi
 -- END UPDATING QUERIES
 --
 COMMIT;
-END;
-//
+END //
 DELIMITER ;
 CALL updateDb();
 DROP PROCEDURE IF EXISTS `updateDb`;
diff --git a/data/sql/updates/db_world/2017_02_03_12.sql b/data/sql/updates/db_world/2017_02_03_12.sql
index 394bbed7a..1858d6dbf 100644
--- a/data/sql/updates/db_world/2017_02_03_12.sql
+++ b/data/sql/updates/db_world/2017_02_03_12.sql
@@ -59,8 +59,7 @@ INSERT INTO `waypoints` (`entry`, `pointid`, `position_x`, `position_y`, `positi
 -- END UPDATING QUERIES
 --
 COMMIT;
-END;
-//
+END //
 DELIMITER ;
 CALL updateDb();
 DROP PROCEDURE IF EXISTS `updateDb`;
diff --git a/data/sql/updates/db_world/2017_02_03_13.sql b/data/sql/updates/db_world/2017_02_03_13.sql
index ace4105ed..a90f8ce0f 100644
--- a/data/sql/updates/db_world/2017_02_03_13.sql
+++ b/data/sql/updates/db_world/2017_02_03_13.sql
@@ -143,8 +143,7 @@ INSERT INTO `waypoints` (`entry`, `pointid`, `position_x`, `position_y`, `positi
 -- END UPDATING QUERIES
 --
 COMMIT;
-END;
-//
+END //
 DELIMITER ;
 CALL updateDb();
 DROP PROCEDURE IF EXISTS `updateDb`;
diff --git a/data/sql/updates/db_world/2017_02_03_14.sql b/data/sql/updates/db_world/2017_02_03_14.sql
index e2987251d..8f0a0c785 100644
--- a/data/sql/updates/db_world/2017_02_03_14.sql
+++ b/data/sql/updates/db_world/2017_02_03_14.sql
@@ -78,8 +78,7 @@ INSERT INTO `creature_text` (`entry`, `groupid`, `id`, `text`, `type`, `language
 -- END UPDATING QUERIES
 --
 COMMIT;
-END;
-//
+END //
 DELIMITER ;
 CALL updateDb();
 DROP PROCEDURE IF EXISTS `updateDb`;
diff --git a/data/sql/updates/db_world/2017_02_03_15.sql b/data/sql/updates/db_world/2017_02_03_15.sql
index 91b8be674..2d32baff3 100644
--- a/data/sql/updates/db_world/2017_02_03_15.sql
+++ b/data/sql/updates/db_world/2017_02_03_15.sql
@@ -184,8 +184,7 @@ INSERT INTO `waypoints` (`entry`, `pointid`, `position_x`, `position_y`, `positi
 -- END UPDATING QUERIES
 --
 COMMIT;
-END;
-//
+END //
 DELIMITER ;
 CALL updateDb();
 DROP PROCEDURE IF EXISTS `updateDb`;
diff --git a/data/sql/updates/db_world/2017_02_03_16.sql b/data/sql/updates/db_world/2017_02_03_16.sql
index 7d11ce0ea..c162f7c78 100644
--- a/data/sql/updates/db_world/2017_02_03_16.sql
+++ b/data/sql/updates/db_world/2017_02_03_16.sql
@@ -109,8 +109,7 @@ INSERT INTO `creature_text` (`entry`, `groupid`, `id`, `text`, `type`, `language
 -- END UPDATING QUERIES
 --
 COMMIT;
-END;
-//
+END //
 DELIMITER ;
 CALL updateDb();
 DROP PROCEDURE IF EXISTS `updateDb`;
diff --git a/data/sql/updates/db_world/2017_02_03_17.sql b/data/sql/updates/db_world/2017_02_03_17.sql
index 8ddb4c951..54238647e 100644
--- a/data/sql/updates/db_world/2017_02_03_17.sql
+++ b/data/sql/updates/db_world/2017_02_03_17.sql
@@ -143,8 +143,7 @@ UPDATE `waypoint_data` SET `action_chance`=100 WHERE `action` BETWEEN @SCTIPT_ID
 -- END UPDATING QUERIES
 --
 COMMIT;
-END;
-//
+END //
 DELIMITER ;
 CALL updateDb();
 DROP PROCEDURE IF EXISTS `updateDb`;
diff --git a/data/sql/updates/db_world/2017_02_03_18.sql b/data/sql/updates/db_world/2017_02_03_18.sql
index f2fa2e3d7..cc98fc5a7 100644
--- a/data/sql/updates/db_world/2017_02_03_18.sql
+++ b/data/sql/updates/db_world/2017_02_03_18.sql
@@ -102,8 +102,7 @@ UPDATE `waypoint_data` SET `move_type`=1 WHERE `id`=@PATH;--
 -- END UPDATING QUERIES
 --
 COMMIT;
-END;
-//
+END //
 DELIMITER ;
 CALL updateDb();
 DROP PROCEDURE IF EXISTS `updateDb`;
diff --git a/data/sql/updates/db_world/2017_02_03_19.sql b/data/sql/updates/db_world/2017_02_03_19.sql
index ca71ab29e..03a131e3f 100644
--- a/data/sql/updates/db_world/2017_02_03_19.sql
+++ b/data/sql/updates/db_world/2017_02_03_19.sql
@@ -135,8 +135,7 @@ UPDATE `waypoint_data` SET `action_chance`=100 WHERE `action` BETWEEN @SCRIPTID+
 -- END UPDATING QUERIES
 --
 COMMIT;
-END;
-//
+END //
 DELIMITER ;
 CALL updateDb();
 DROP PROCEDURE IF EXISTS `updateDb`;
diff --git a/data/sql/updates/db_world/2017_02_03_20.sql b/data/sql/updates/db_world/2017_02_03_20.sql
index b34cb9da6..8db2b86db 100644
--- a/data/sql/updates/db_world/2017_02_03_20.sql
+++ b/data/sql/updates/db_world/2017_02_03_20.sql
@@ -165,8 +165,7 @@ UPDATE `waypoint_data` SET `action_chance`=100 WHERE `action` IN (@SCRIPTID);--
 -- END UPDATING QUERIES
 --
 COMMIT;
-END;
-//
+END //
 DELIMITER ;
 CALL updateDb();
 DROP PROCEDURE IF EXISTS `updateDb`;
diff --git a/data/sql/updates/db_world/2017_02_03_21.sql b/data/sql/updates/db_world/2017_02_03_21.sql
index af771deb9..ff45269ac 100644
--- a/data/sql/updates/db_world/2017_02_03_21.sql
+++ b/data/sql/updates/db_world/2017_02_03_21.sql
@@ -159,8 +159,7 @@ INSERT INTO `creature_text` (`entry`, `groupid`, `id`, `text`, `type`, `language
 -- END UPDATING QUERIES
 --
 COMMIT;
-END;
-//
+END //
 DELIMITER ;
 CALL updateDb();
 DROP PROCEDURE IF EXISTS `updateDb`;
diff --git a/data/sql/updates/db_world/2017_02_03_22.sql b/data/sql/updates/db_world/2017_02_03_22.sql
index 0ef4ab7ba..ac148ef11 100644
--- a/data/sql/updates/db_world/2017_02_03_22.sql
+++ b/data/sql/updates/db_world/2017_02_03_22.sql
@@ -73,8 +73,7 @@ INSERT INTO `creature_text` (`entry`, `groupid`, `id`, `text`, `type`, `language
 -- END UPDATING QUERIES
 --
 COMMIT;
-END;
-//
+END //
 DELIMITER ;
 CALL updateDb();
 DROP PROCEDURE IF EXISTS `updateDb`;
diff --git a/data/sql/updates/db_world/2017_02_03_23.sql b/data/sql/updates/db_world/2017_02_03_23.sql
index 3b5006e6f..e98dcda9a 100644
--- a/data/sql/updates/db_world/2017_02_03_23.sql
+++ b/data/sql/updates/db_world/2017_02_03_23.sql
@@ -185,8 +185,7 @@ INSERT INTO `conditions` (`SourceTypeOrReferenceId`, `SourceGroup`, `SourceEntry
 -- END UPDATING QUERIES
 --
 COMMIT;
-END;
-//
+END //
 DELIMITER ;
 CALL updateDb();
 DROP PROCEDURE IF EXISTS `updateDb`;
diff --git a/data/sql/updates/db_world/2017_02_03_24.sql b/data/sql/updates/db_world/2017_02_03_24.sql
index 52c2fb7ea..b8699a2d1 100644
--- a/data/sql/updates/db_world/2017_02_03_24.sql
+++ b/data/sql/updates/db_world/2017_02_03_24.sql
@@ -108,8 +108,7 @@ INSERT INTO `creature_text` (`entry`,`groupid`,`id`,`text`,`type`,`language`,`pr
 -- END UPDATING QUERIES
 --
 COMMIT;
-END;
-//
+END //
 DELIMITER ;
 CALL updateDb();
 DROP PROCEDURE IF EXISTS `updateDb`;
diff --git a/data/sql/updates/db_world/2017_02_03_25.sql b/data/sql/updates/db_world/2017_02_03_25.sql
index d1e3f812d..a585700d7 100644
--- a/data/sql/updates/db_world/2017_02_03_25.sql
+++ b/data/sql/updates/db_world/2017_02_03_25.sql
@@ -59,8 +59,7 @@ INSERT INTO `waypoints` (`entry`, `pointid`, `position_x`, `position_y`, `positi
 -- END UPDATING QUERIES
 --
 COMMIT;
-END;
-//
+END //
 DELIMITER ;
 CALL updateDb();
 DROP PROCEDURE IF EXISTS `updateDb`;
diff --git a/data/sql/updates/db_world/2017_02_03_26.sql b/data/sql/updates/db_world/2017_02_03_26.sql
index 7c3f6ffb3..136684a56 100644
--- a/data/sql/updates/db_world/2017_02_03_26.sql
+++ b/data/sql/updates/db_world/2017_02_03_26.sql
@@ -53,8 +53,7 @@ INSERT INTO `waypoints` (`entry`, `pointid`, `position_x`, `position_y`, `positi
 -- END UPDATING QUERIES
 --
 COMMIT;
-END;
-//
+END //
 DELIMITER ;
 CALL updateDb();
 DROP PROCEDURE IF EXISTS `updateDb`;
diff --git a/data/sql/updates/db_world/2017_02_03_27.sql b/data/sql/updates/db_world/2017_02_03_27.sql
index 4af637708..11a747016 100644
--- a/data/sql/updates/db_world/2017_02_03_27.sql
+++ b/data/sql/updates/db_world/2017_02_03_27.sql
@@ -45,8 +45,7 @@ INSERT INTO `creature_text` (`entry`, `groupid`, `id`, `text`, `type`, `language
 -- END UPDATING QUERIES
 --
 COMMIT;
-END;
-//
+END //
 DELIMITER ;
 CALL updateDb();
 DROP PROCEDURE IF EXISTS `updateDb`;
diff --git a/data/sql/updates/db_world/2017_02_03_28.sql b/data/sql/updates/db_world/2017_02_03_28.sql
index cad87486c..27d6594ba 100644
--- a/data/sql/updates/db_world/2017_02_03_28.sql
+++ b/data/sql/updates/db_world/2017_02_03_28.sql
@@ -51,8 +51,7 @@ INSERT INTO `waypoints` (`entry`, `pointid`, `position_x`, `position_y`, `positi
 -- END UPDATING QUERIES
 --
 COMMIT;
-END;
-//
+END //
 DELIMITER ;
 CALL updateDb();
 DROP PROCEDURE IF EXISTS `updateDb`;
diff --git a/data/sql/updates/db_world/2017_02_03_29.sql b/data/sql/updates/db_world/2017_02_03_29.sql
index c5cf0f67c..7313d8e79 100644
--- a/data/sql/updates/db_world/2017_02_03_29.sql
+++ b/data/sql/updates/db_world/2017_02_03_29.sql
@@ -54,8 +54,7 @@ INSERT INTO `creature_text` (`entry`, `groupid`, `id`, `text`, `type`, `language
 -- END UPDATING QUERIES
 --
 COMMIT;
-END;
-//
+END //
 DELIMITER ;
 CALL updateDb();
 DROP PROCEDURE IF EXISTS `updateDb`;
diff --git a/data/sql/updates/db_world/2017_02_03_30.sql b/data/sql/updates/db_world/2017_02_03_30.sql
index ba443c88a..4e38c33e5 100644
--- a/data/sql/updates/db_world/2017_02_03_30.sql
+++ b/data/sql/updates/db_world/2017_02_03_30.sql
@@ -49,8 +49,7 @@ INSERT INTO `creature_text` (`entry`, `groupid`, `id`, `text`, `type`, `language
 -- END UPDATING QUERIES
 --
 COMMIT;
-END;
-//
+END //
 DELIMITER ;
 CALL updateDb();
 DROP PROCEDURE IF EXISTS `updateDb`;
diff --git a/data/sql/updates/db_world/2017_02_03_31.sql b/data/sql/updates/db_world/2017_02_03_31.sql
index 50505cadc..baf0954ea 100644
--- a/data/sql/updates/db_world/2017_02_03_31.sql
+++ b/data/sql/updates/db_world/2017_02_03_31.sql
@@ -92,8 +92,7 @@ INSERT INTO `waypoints` (`entry`, `pointid`, `position_x`, `position_y`, `positi
 -- END UPDATING QUERIES
 --
 COMMIT;
-END;
-//
+END //
 DELIMITER ;
 CALL updateDb();
 DROP PROCEDURE IF EXISTS `updateDb`;
diff --git a/data/sql/updates/db_world/2017_02_03_32.sql b/data/sql/updates/db_world/2017_02_03_32.sql
index cde3f5176..f8832565e 100644
--- a/data/sql/updates/db_world/2017_02_03_32.sql
+++ b/data/sql/updates/db_world/2017_02_03_32.sql
@@ -89,8 +89,7 @@ INSERT INTO `waypoints` (`entry`, `pointid`, `position_x`, `position_y`, `positi
 -- END UPDATING QUERIES
 --
 COMMIT;
-END;
-//
+END //
 DELIMITER ;
 CALL updateDb();
 DROP PROCEDURE IF EXISTS `updateDb`;
diff --git a/data/sql/updates/db_world/2017_02_03_33.sql b/data/sql/updates/db_world/2017_02_03_33.sql
index 70c9bfe2f..f7507a7af 100644
--- a/data/sql/updates/db_world/2017_02_03_33.sql
+++ b/data/sql/updates/db_world/2017_02_03_33.sql
@@ -65,8 +65,7 @@ INSERT INTO `waypoints` (`entry`, `pointid`, `position_x`, `position_y`, `positi
 -- END UPDATING QUERIES
 --
 COMMIT;
-END;
-//
+END //
 DELIMITER ;
 CALL updateDb();
 DROP PROCEDURE IF EXISTS `updateDb`;
diff --git a/data/sql/updates/db_world/2017_02_03_34.sql b/data/sql/updates/db_world/2017_02_03_34.sql
index 3a0649352..fdaf66d2d 100644
--- a/data/sql/updates/db_world/2017_02_03_34.sql
+++ b/data/sql/updates/db_world/2017_02_03_34.sql
@@ -172,8 +172,7 @@ INSERT INTO `waypoint_data` (`id`,`point`,`position_x`,`position_y`,`position_z`
 -- END UPDATING QUERIES
 --
 COMMIT;
-END;
-//
+END //
 DELIMITER ;
 CALL updateDb();
 DROP PROCEDURE IF EXISTS `updateDb`;
diff --git a/data/sql/updates/db_world/2017_02_03_35.sql b/data/sql/updates/db_world/2017_02_03_35.sql
index 6ffcf8e16..5ef6f5800 100644
--- a/data/sql/updates/db_world/2017_02_03_35.sql
+++ b/data/sql/updates/db_world/2017_02_03_35.sql
@@ -81,8 +81,7 @@ UPDATE `waypoint_data` SET `action_chance`=100 WHERE `action` IN (@SCRIPTID);--
 -- END UPDATING QUERIES
 --
 COMMIT;
-END;
-//
+END //
 DELIMITER ;
 CALL updateDb();
 DROP PROCEDURE IF EXISTS `updateDb`;
diff --git a/data/sql/updates/db_world/2017_02_03_36.sql b/data/sql/updates/db_world/2017_02_03_36.sql
index b6467efc9..9d41ab7fd 100644
--- a/data/sql/updates/db_world/2017_02_03_36.sql
+++ b/data/sql/updates/db_world/2017_02_03_36.sql
@@ -23,8 +23,7 @@ INSERT INTO `spell_area` (`spell`, `area`, `quest_start`, `quest_end`, `aura_spe
 -- END UPDATING QUERIES
 --
 COMMIT;
-END;
-//
+END //
 DELIMITER ;
 CALL updateDb();
 DROP PROCEDURE IF EXISTS `updateDb`;
diff --git a/data/sql/updates/db_world/2017_02_03_37.sql b/data/sql/updates/db_world/2017_02_03_37.sql
index 9b65040c1..3b97a9363 100644
--- a/data/sql/updates/db_world/2017_02_03_37.sql
+++ b/data/sql/updates/db_world/2017_02_03_37.sql
@@ -30,8 +30,7 @@ INSERT INTO `spell_area` (`spell`, `area`, `quest_start`, `quest_end`, `aura_spe
 -- END UPDATING QUERIES
 --
 COMMIT;
-END;
-//
+END //
 DELIMITER ;
 CALL updateDb();
 DROP PROCEDURE IF EXISTS `updateDb`;
diff --git a/data/sql/updates/db_world/2017_02_03_38.sql b/data/sql/updates/db_world/2017_02_03_38.sql
index 97d507912..8c994ffb9 100644
--- a/data/sql/updates/db_world/2017_02_03_38.sql
+++ b/data/sql/updates/db_world/2017_02_03_38.sql
@@ -18,8 +18,7 @@ DELETE FROM `creature_loot_template` WHERE `item` = 23612 AND `entry` IN (21060,
 -- END UPDATING QUERIES
 --
 COMMIT;
-END;
-//
+END //
 DELIMITER ;
 CALL updateDb();
 DROP PROCEDURE IF EXISTS `updateDb`;
diff --git a/data/sql/updates/db_world/2017_02_03_39.sql b/data/sql/updates/db_world/2017_02_03_39.sql
index 1447ba984..03b793244 100644
--- a/data/sql/updates/db_world/2017_02_03_39.sql
+++ b/data/sql/updates/db_world/2017_02_03_39.sql
@@ -151,8 +151,7 @@ UPDATE `creature` SET `SpawnDist` = 0, `MovementType` = 0 WHERE `guid` IN (79369
 -- END UPDATING QUERIES
 --
 COMMIT;
-END;
-//
+END //
 DELIMITER ;
 CALL updateDb();
 DROP PROCEDURE IF EXISTS `updateDb`;
diff --git a/data/sql/updates/db_world/2017_02_03_40.sql b/data/sql/updates/db_world/2017_02_03_40.sql
index de109344f..fa51248d1 100644
--- a/data/sql/updates/db_world/2017_02_03_40.sql
+++ b/data/sql/updates/db_world/2017_02_03_40.sql
@@ -1879,8 +1879,7 @@ UPDATE `creature` SET `SpawnTimeSecs` = 180 WHERE `map` IN (560) AND id IN (2350
 -- END UPDATING QUERIES
 --
 COMMIT;
-END;
-//
+END //
 DELIMITER ;
 CALL updateDb();
 DROP PROCEDURE IF EXISTS `updateDb`;
diff --git a/data/sql/updates/db_world/2017_02_03_41.sql b/data/sql/updates/db_world/2017_02_03_41.sql
index 9b0b2ceed..31e717685 100644
--- a/data/sql/updates/db_world/2017_02_03_41.sql
+++ b/data/sql/updates/db_world/2017_02_03_41.sql
@@ -146,8 +146,7 @@ UPDATE `gameobject` SET `spawntimesecs` = 10800 WHERE `guid` = 12029;
 -- END UPDATING QUERIES
 --
 COMMIT;
-END;
-//
+END //
 DELIMITER ;
 CALL updateDb();
 DROP PROCEDURE IF EXISTS `updateDb`;
diff --git a/data/sql/updates/db_world/2017_02_03_42.sql b/data/sql/updates/db_world/2017_02_03_42.sql
index 97e124c52..ee64bb6f8 100644
--- a/data/sql/updates/db_world/2017_02_03_42.sql
+++ b/data/sql/updates/db_world/2017_02_03_42.sql
@@ -20,8 +20,7 @@ UPDATE `creature_template` SET `VehicleId`=244 WHERE `entry`=30236;--
 -- END UPDATING QUERIES
 --
 COMMIT;
-END;
-//
+END //
 DELIMITER ;
 CALL updateDb();
 DROP PROCEDURE IF EXISTS `updateDb`;
diff --git a/data/sql/updates/db_world/2017_02_03_43.sql b/data/sql/updates/db_world/2017_02_03_43.sql
index e06bc63dc..fe05901f0 100644
--- a/data/sql/updates/db_world/2017_02_03_43.sql
+++ b/data/sql/updates/db_world/2017_02_03_43.sql
@@ -23,8 +23,7 @@ UPDATE `creature_template` SET `speed_run` = 1.14286  WHERE `entry` IN (34657, 3
 -- END UPDATING QUERIES
 --
 COMMIT;
-END;
-//
+END //
 DELIMITER ;
 CALL updateDb();
 DROP PROCEDURE IF EXISTS `updateDb`;
diff --git a/data/sql/updates/db_world/2017_02_03_44.sql b/data/sql/updates/db_world/2017_02_03_44.sql
index 3a8f46c11..c634f833e 100644
--- a/data/sql/updates/db_world/2017_02_03_44.sql
+++ b/data/sql/updates/db_world/2017_02_03_44.sql
@@ -34,8 +34,7 @@ INSERT INTO `creature_template` (`entry`, `difficulty_entry_1`, `difficulty_entr
 -- END UPDATING QUERIES
 --
 COMMIT;
-END;
-//
+END //
 DELIMITER ;
 CALL updateDb();
 DROP PROCEDURE IF EXISTS `updateDb`;
diff --git a/data/sql/updates/db_world/2017_02_03_45.sql b/data/sql/updates/db_world/2017_02_03_45.sql
index fa170ce72..77f92100c 100644
--- a/data/sql/updates/db_world/2017_02_03_45.sql
+++ b/data/sql/updates/db_world/2017_02_03_45.sql
@@ -20,8 +20,7 @@ UPDATE `creature_text` SET `emote` = "398", `duration` = "3000" WHERE `entry` =
 -- END UPDATING QUERIES
 --
 COMMIT;
-END;
-//
+END //
 DELIMITER ;
 CALL updateDb();
 DROP PROCEDURE IF EXISTS `updateDb`;
diff --git a/data/sql/updates/db_world/2017_02_03_46.sql b/data/sql/updates/db_world/2017_02_03_46.sql
index 8b2e44eda..dbb5d2457 100644
--- a/data/sql/updates/db_world/2017_02_03_46.sql
+++ b/data/sql/updates/db_world/2017_02_03_46.sql
@@ -21,8 +21,7 @@ INSERT INTO `disables` (`sourceType`, `entry`, `flags`, `params_0`, `params_1`,
 -- END UPDATING QUERIES
 --
 COMMIT;
-END;
-//
+END //
 DELIMITER ;
 CALL updateDb();
 DROP PROCEDURE IF EXISTS `updateDb`;
diff --git a/data/sql/updates/db_world/2017_02_03_47.sql b/data/sql/updates/db_world/2017_02_03_47.sql
index 117e84a0a..5b5af0675 100644
--- a/data/sql/updates/db_world/2017_02_03_47.sql
+++ b/data/sql/updates/db_world/2017_02_03_47.sql
@@ -29,8 +29,7 @@ UPDATE `quest_template_addon` SET `SpecialFlags` = "2" WHERE `ID` = "10409";--
 -- END UPDATING QUERIES
 --
 COMMIT;
-END;
-//
+END //
 DELIMITER ;
 CALL updateDb();
 DROP PROCEDURE IF EXISTS `updateDb`;
diff --git a/data/sql/updates/db_world/2017_03_04_00.sql b/data/sql/updates/db_world/2017_03_04_00.sql
index 0ca83b078..b0b395329 100644
--- a/data/sql/updates/db_world/2017_03_04_00.sql
+++ b/data/sql/updates/db_world/2017_03_04_00.sql
@@ -29,8 +29,7 @@ INSERT INTO `creature_loot_template` (`entry`, `item`, `ChanceOrQuestChance`, `l
 -- END UPDATING QUERIES
 --
 COMMIT;
-END;
-//
+END //
 DELIMITER ;
 CALL updateDb();
 DROP PROCEDURE IF EXISTS `updateDb`;
diff --git a/data/sql/updates/db_world/2017_03_04_01.sql b/data/sql/updates/db_world/2017_03_04_01.sql
index 2ca5a2c6e..c06970b99 100644
--- a/data/sql/updates/db_world/2017_03_04_01.sql
+++ b/data/sql/updates/db_world/2017_03_04_01.sql
@@ -20,8 +20,7 @@ UPDATE `creature` SET `modelid` = 24818 WHERE `guid` IN (117789);--
 -- END UPDATING QUERIES
 --
 COMMIT;
-END;
-//
+END //
 DELIMITER ;
 CALL updateDb();
 DROP PROCEDURE IF EXISTS `updateDb`;
diff --git a/data/sql/updates/db_world/2017_03_04_02.sql b/data/sql/updates/db_world/2017_03_04_02.sql
index 686c3250f..a3cf9290e 100644
--- a/data/sql/updates/db_world/2017_03_04_02.sql
+++ b/data/sql/updates/db_world/2017_03_04_02.sql
@@ -166,8 +166,7 @@ INSERT INTO `waypoint_data` (`id`,`point`,`position_x`,`position_y`,`position_z`
 -- END UPDATING QUERIES
 --
 COMMIT;
-END;
-//
+END //
 DELIMITER ;
 CALL updateDb();
 DROP PROCEDURE IF EXISTS `updateDb`;
diff --git a/data/sql/updates/db_world/2017_03_04_03.sql b/data/sql/updates/db_world/2017_03_04_03.sql
index fb9479b75..e01067316 100644
--- a/data/sql/updates/db_world/2017_03_04_03.sql
+++ b/data/sql/updates/db_world/2017_03_04_03.sql
@@ -40,8 +40,7 @@ INSERT INTO `waypoint_data` (`id`,`point`,`position_x`,`position_y`,`position_z`
 -- END UPDATING QUERIES
 --
 COMMIT;
-END;
-//
+END //
 DELIMITER ;
 CALL updateDb();
 DROP PROCEDURE IF EXISTS `updateDb`;
diff --git a/data/sql/updates/db_world/2017_03_04_04.sql b/data/sql/updates/db_world/2017_03_04_04.sql
index d16d150bb..14c7b872a 100644
--- a/data/sql/updates/db_world/2017_03_04_04.sql
+++ b/data/sql/updates/db_world/2017_03_04_04.sql
@@ -18,8 +18,7 @@ UPDATE `creature_addon` SET `bytes1`=0, `auras`=45787 WHERE  `guid`=97150;--
 -- END UPDATING QUERIES
 --
 COMMIT;
-END;
-//
+END //
 DELIMITER ;
 CALL updateDb();
 DROP PROCEDURE IF EXISTS `updateDb`;
diff --git a/data/sql/updates/db_world/2017_03_04_05.sql b/data/sql/updates/db_world/2017_03_04_05.sql
index 6e81dd5db..f110eaa81 100644
--- a/data/sql/updates/db_world/2017_03_04_05.sql
+++ b/data/sql/updates/db_world/2017_03_04_05.sql
@@ -21,8 +21,7 @@ INSERT INTO `spell_linked_spell` (`spell_trigger` ,`spell_effect`, `type`, `comm
 -- END UPDATING QUERIES
 --
 COMMIT;
-END;
-//
+END //
 DELIMITER ;
 CALL updateDb();
 DROP PROCEDURE IF EXISTS `updateDb`;
diff --git a/data/sql/updates/db_world/2017_03_04_06.sql b/data/sql/updates/db_world/2017_03_04_06.sql
index 43e5433c5..14a411a77 100644
--- a/data/sql/updates/db_world/2017_03_04_06.sql
+++ b/data/sql/updates/db_world/2017_03_04_06.sql
@@ -18,8 +18,7 @@ UPDATE `creature_addon` SET `auras`=55701 WHERE `guid`=100071;--
 -- END UPDATING QUERIES
 --
 COMMIT;
-END;
-//
+END //
 DELIMITER ;
 CALL updateDb();
 DROP PROCEDURE IF EXISTS `updateDb`;
diff --git a/data/sql/updates/db_world/2017_03_04_07.sql b/data/sql/updates/db_world/2017_03_04_07.sql
index 6eb20f0d7..fabe9d3a6 100644
--- a/data/sql/updates/db_world/2017_03_04_07.sql
+++ b/data/sql/updates/db_world/2017_03_04_07.sql
@@ -20,8 +20,7 @@ UPDATE `creature_template` SET `flags_extra`=32768 WHERE `entry`=7980;--
 -- END UPDATING QUERIES
 --
 COMMIT;
-END;
-//
+END //
 DELIMITER ;
 CALL updateDb();
 DROP PROCEDURE IF EXISTS `updateDb`;
diff --git a/data/sql/updates/db_world/2017_03_04_08.sql b/data/sql/updates/db_world/2017_03_04_08.sql
index 66449f0a5..80309d44c 100644
--- a/data/sql/updates/db_world/2017_03_04_08.sql
+++ b/data/sql/updates/db_world/2017_03_04_08.sql
@@ -59,8 +59,7 @@ INSERT INTO `creature_text` (`entry`, `groupid`, `id`, `text`, `type`, `language
 -- END UPDATING QUERIES
 --
 COMMIT;
-END;
-//
+END //
 DELIMITER ;
 CALL updateDb();
 DROP PROCEDURE IF EXISTS `updateDb`;
diff --git a/data/sql/updates/db_world/2017_03_04_09.sql b/data/sql/updates/db_world/2017_03_04_09.sql
index d8859cb07..1232392da 100644
--- a/data/sql/updates/db_world/2017_03_04_09.sql
+++ b/data/sql/updates/db_world/2017_03_04_09.sql
@@ -20,8 +20,7 @@ UPDATE `item_template` SET `spellcooldown_1` = 30000 WHERE `entry` IN (44010);
 -- END UPDATING QUERIES
 --
 COMMIT;
-END;
-//
+END //
 DELIMITER ;
 CALL updateDb();
 DROP PROCEDURE IF EXISTS `updateDb`;
diff --git a/data/sql/updates/db_world/2017_03_04_10.sql b/data/sql/updates/db_world/2017_03_04_10.sql
index 5525cf381..d4c15f8d4 100644
--- a/data/sql/updates/db_world/2017_03_04_10.sql
+++ b/data/sql/updates/db_world/2017_03_04_10.sql
@@ -24,8 +24,7 @@ INSERT INTO `spell_area` (`spell`, `area`, `quest_start`, `quest_end`, `aura_spe
 -- END UPDATING QUERIES
 --
 COMMIT;
-END;
-//
+END //
 DELIMITER ;
 CALL updateDb();
 DROP PROCEDURE IF EXISTS `updateDb`;
diff --git a/data/sql/updates/db_world/2017_03_04_11.sql b/data/sql/updates/db_world/2017_03_04_11.sql
index c84ff8b6d..6d7d8647e 100644
--- a/data/sql/updates/db_world/2017_03_04_11.sql
+++ b/data/sql/updates/db_world/2017_03_04_11.sql
@@ -54,8 +54,7 @@ INSERT INTO `conditions` (`SourceTypeOrReferenceId`,`SourceGroup`,`SourceEntry`,
 -- END UPDATING QUERIES
 --
 COMMIT;
-END;
-//
+END //
 DELIMITER ;
 CALL updateDb();
 DROP PROCEDURE IF EXISTS `updateDb`;
diff --git a/data/sql/updates/db_world/2017_03_04_12.sql b/data/sql/updates/db_world/2017_03_04_12.sql
index 579defc72..675504e5f 100644
--- a/data/sql/updates/db_world/2017_03_04_12.sql
+++ b/data/sql/updates/db_world/2017_03_04_12.sql
@@ -19,8 +19,7 @@ UPDATE `quest_template` SET `TimeAllowed` = 0 WHERE `id` IN(3364);
 -- END UPDATING QUERIES
 --
 COMMIT;
-END;
-//
+END //
 DELIMITER ;
 CALL updateDb();
 DROP PROCEDURE IF EXISTS `updateDb`;
diff --git a/data/sql/updates/db_world/2017_03_04_13.sql b/data/sql/updates/db_world/2017_03_04_13.sql
index 03588bcd3..efe2c8778 100644
--- a/data/sql/updates/db_world/2017_03_04_13.sql
+++ b/data/sql/updates/db_world/2017_03_04_13.sql
@@ -63,8 +63,7 @@ INSERT INTO `conditions` (`SourceTypeOrReferenceId`,`SourceGroup`,`SourceEntry`,
 -- END UPDATING QUERIES
 --
 COMMIT;
-END;
-//
+END //
 DELIMITER ;
 CALL updateDb();
 DROP PROCEDURE IF EXISTS `updateDb`;
diff --git a/data/sql/updates/db_world/2017_03_04_14.sql b/data/sql/updates/db_world/2017_03_04_14.sql
index 9a20addd6..24e422251 100644
--- a/data/sql/updates/db_world/2017_03_04_14.sql
+++ b/data/sql/updates/db_world/2017_03_04_14.sql
@@ -66,8 +66,7 @@ INSERT INTO `creature_text` (`entry`, `groupid`, `id`, `text`, `type`, `language
 -- END UPDATING QUERIES
 --
 COMMIT;
-END;
-//
+END //
 DELIMITER ;
 CALL updateDb();
 DROP PROCEDURE IF EXISTS `updateDb`;
diff --git a/data/sql/updates/db_world/2017_03_04_15.sql b/data/sql/updates/db_world/2017_03_04_15.sql
index 62fc9c6a7..bc34fc0d8 100644
--- a/data/sql/updates/db_world/2017_03_04_15.sql
+++ b/data/sql/updates/db_world/2017_03_04_15.sql
@@ -66,8 +66,7 @@ INSERT INTO `creature_text` (`entry`, `groupid`, `id`, `text`, `type`, `language
 -- END UPDATING QUERIES
 --
 COMMIT;
-END;
-//
+END //
 DELIMITER ;
 CALL updateDb();
 DROP PROCEDURE IF EXISTS `updateDb`;
diff --git a/data/sql/updates/db_world/2017_03_04_16.sql b/data/sql/updates/db_world/2017_03_04_16.sql
index 57ead3cb0..b7da2a3d8 100644
--- a/data/sql/updates/db_world/2017_03_04_16.sql
+++ b/data/sql/updates/db_world/2017_03_04_16.sql
@@ -20,8 +20,7 @@ UPDATE `creature` SET `map` = 47 WHERE `guid` = 84369 AND `id` = 4512;
 -- END UPDATING QUERIES
 --
 COMMIT;
-END;
-//
+END //
 DELIMITER ;
 CALL updateDb();
 DROP PROCEDURE IF EXISTS `updateDb`;
diff --git a/data/sql/updates/db_world/2017_03_04_17.sql b/data/sql/updates/db_world/2017_03_04_17.sql
index 47a935c74..e54c71418 100644
--- a/data/sql/updates/db_world/2017_03_04_17.sql
+++ b/data/sql/updates/db_world/2017_03_04_17.sql
@@ -57,8 +57,7 @@ INSERT INTO `waypoint_data`(`id`,`point`,`position_x`,`position_y`,`position_z`,
 -- END UPDATING QUERIES
 --
 COMMIT;
-END;
-//
+END //
 DELIMITER ;
 CALL updateDb();
 DROP PROCEDURE IF EXISTS `updateDb`;
diff --git a/data/sql/updates/db_world/2017_03_04_18.sql b/data/sql/updates/db_world/2017_03_04_18.sql
index a65bfa716..52afd9158 100644
--- a/data/sql/updates/db_world/2017_03_04_18.sql
+++ b/data/sql/updates/db_world/2017_03_04_18.sql
@@ -25,8 +25,7 @@ INSERT INTO `spell_script_names` (`spell_id`, `ScriptName`) VALUES
 -- END UPDATING QUERIES
 --
 COMMIT;
-END;
-//
+END //
 DELIMITER ;
 CALL updateDb();
 DROP PROCEDURE IF EXISTS `updateDb`;
diff --git a/data/sql/updates/db_world/2017_03_04_19.sql b/data/sql/updates/db_world/2017_03_04_19.sql
index 321c3efe5..ea6bff49c 100644
--- a/data/sql/updates/db_world/2017_03_04_19.sql
+++ b/data/sql/updates/db_world/2017_03_04_19.sql
@@ -22,8 +22,7 @@ INSERT INTO `creature` (`guid`, `id`, `map`, `spawnMask`, `phaseMask`, `modelid`
 -- END UPDATING QUERIES
 --
 COMMIT;
-END;
-//
+END //
 DELIMITER ;
 CALL updateDb();
 DROP PROCEDURE IF EXISTS `updateDb`;
diff --git a/data/sql/updates/db_world/2017_03_04_20.sql b/data/sql/updates/db_world/2017_03_04_20.sql
index 2d0dfc822..5d434b678 100644
--- a/data/sql/updates/db_world/2017_03_04_20.sql
+++ b/data/sql/updates/db_world/2017_03_04_20.sql
@@ -22,8 +22,7 @@ IF OK <> 'FALSE' THEN LEAVE proc; END IF;
 INSERT INTO version_db_world (`sql_rev`) VALUES ('1488633880780960000');
 
 COMMIT;
-END;
-//
+END //
 DELIMITER ;
 CALL updateDb();
 DROP PROCEDURE IF EXISTS `updateDb`;
diff --git a/data/sql/updates/db_world/2017_05_01_00.sql b/data/sql/updates/db_world/2017_05_01_00.sql
index 9cc13140c..4ed2c1f4e 100644
--- a/data/sql/updates/db_world/2017_05_01_00.sql
+++ b/data/sql/updates/db_world/2017_05_01_00.sql
@@ -166,8 +166,7 @@ INSERT INTO `npc_text` (`ID`, `text0_0`) VALUES
 -- END UPDATING QUERIES
 --
 COMMIT;
-END;
-//
+END //
 DELIMITER ;
 CALL updateDb();
 DROP PROCEDURE IF EXISTS `updateDb`;
diff --git a/data/sql/updates/db_world/2017_05_01_01.sql b/data/sql/updates/db_world/2017_05_01_01.sql
index 89f956e94..953c644eb 100644
--- a/data/sql/updates/db_world/2017_05_01_01.sql
+++ b/data/sql/updates/db_world/2017_05_01_01.sql
@@ -37,8 +37,7 @@ INSERT INTO `command` (`name`,`security`,`help`) VALUES
 -- END UPDATING QUERIES
 --
 COMMIT;
-END;
-//
+END //
 DELIMITER ;
 CALL updateDb();
 DROP PROCEDURE IF EXISTS `updateDb`;
diff --git a/data/sql/updates/db_world/2017_05_01_02.sql b/data/sql/updates/db_world/2017_05_01_02.sql
index ec0a81888..a9f49e628 100644
--- a/data/sql/updates/db_world/2017_05_01_02.sql
+++ b/data/sql/updates/db_world/2017_05_01_02.sql
@@ -35,8 +35,7 @@ INSERT INTO `item_loot_template` (`Entry`,`Item`,`ChanceOrQuestChance`,`LootMode
 -- END UPDATING QUERIES
 --
 COMMIT;
-END;
-//
+END //
 DELIMITER ;
 CALL updateDb();
 DROP PROCEDURE IF EXISTS `updateDb`;
diff --git a/data/sql/updates/db_world/2017_05_01_03.sql b/data/sql/updates/db_world/2017_05_01_03.sql
index 84222f015..e64a88230 100644
--- a/data/sql/updates/db_world/2017_05_01_03.sql
+++ b/data/sql/updates/db_world/2017_05_01_03.sql
@@ -29,8 +29,7 @@ DELETE FROM `gameobject` WHERE (id = 73941) AND (guid IN (14685));
 -- END UPDATING QUERIES
 --
 COMMIT;
-END;
-//
+END //
 DELIMITER ;
 CALL updateDb();
 DROP PROCEDURE IF EXISTS `updateDb`;
diff --git a/data/sql/updates/db_world/2017_05_01_04.sql b/data/sql/updates/db_world/2017_05_01_04.sql
index 7e84f2f20..1f8e3cc58 100644
--- a/data/sql/updates/db_world/2017_05_01_04.sql
+++ b/data/sql/updates/db_world/2017_05_01_04.sql
@@ -24,8 +24,7 @@ UPDATE `spell_proc` SET `Cooldown`=0 WHERE `SpellId`=64440;
 -- END UPDATING QUERIES
 --
 COMMIT;
-END;
-//
+END //
 DELIMITER ;
 CALL updateDb();
 DROP PROCEDURE IF EXISTS `updateDb`;
diff --git a/data/sql/updates/db_world/2017_05_01_05.sql b/data/sql/updates/db_world/2017_05_01_05.sql
index b22bb3ce6..3f366d2fb 100644
--- a/data/sql/updates/db_world/2017_05_01_05.sql
+++ b/data/sql/updates/db_world/2017_05_01_05.sql
@@ -82,8 +82,7 @@ INSERT INTO `smart_scripts` (`entryorguid`, `source_type`, `id`, `link`, `event_
 -- END UPDATING QUERIES
 --
 COMMIT;
-END;
-//
+END //
 DELIMITER ;
 CALL updateDb();
 DROP PROCEDURE IF EXISTS `updateDb`;
diff --git a/data/sql/updates/db_world/2017_05_01_06.sql b/data/sql/updates/db_world/2017_05_01_06.sql
index 407cbbd5e..b5a1d9273 100644
--- a/data/sql/updates/db_world/2017_05_01_06.sql
+++ b/data/sql/updates/db_world/2017_05_01_06.sql
@@ -32,8 +32,7 @@ INSERT INTO `conditions` (`SourceTypeOrReferenceId`,`SourceGroup`,`SourceEntry`,
 -- END UPDATING QUERIES
 --
 COMMIT;
-END;
-//
+END //
 DELIMITER ;
 CALL updateDb();
 DROP PROCEDURE IF EXISTS `updateDb`;
diff --git a/data/sql/updates/db_world/2017_05_01_07.sql b/data/sql/updates/db_world/2017_05_01_07.sql
index 3b6406b96..63b88b6d2 100644
--- a/data/sql/updates/db_world/2017_05_01_07.sql
+++ b/data/sql/updates/db_world/2017_05_01_07.sql
@@ -28,8 +28,7 @@ INSERT INTO `smart_scripts` (`entryorguid`,`source_type`,`id`,`link`,`event_type
 -- END UPDATING QUERIES
 --
 COMMIT;
-END;
-//
+END //
 DELIMITER ;
 CALL updateDb();
 DROP PROCEDURE IF EXISTS `updateDb`;
diff --git a/data/sql/updates/db_world/2017_05_28_00.sql b/data/sql/updates/db_world/2017_05_28_00.sql
index 2f1d3f236..df44cc7c4 100644
--- a/data/sql/updates/db_world/2017_05_28_00.sql
+++ b/data/sql/updates/db_world/2017_05_28_00.sql
@@ -325,8 +325,7 @@ UPDATE `pet_levelstats` SET `str`=314, `agi`= 90, `sta`=328, `inte`=150, `spi`=2
 -- END UPDATING QUERIES
 --
 COMMIT;
-END;
-//
+END //
 DELIMITER ;
 CALL updateDb();
 DROP PROCEDURE IF EXISTS `updateDb`;
diff --git a/data/sql/updates/db_world/2017_06_12_00.sql b/data/sql/updates/db_world/2017_06_12_00.sql
index 03fde3902..073d88fc8 100644
--- a/data/sql/updates/db_world/2017_06_12_00.sql
+++ b/data/sql/updates/db_world/2017_06_12_00.sql
@@ -25,8 +25,7 @@ INSERT INTO command (name, security, help) VALUES
 -- END UPDATING QUERIES
 --
 COMMIT;
-END;
-//
+END //
 DELIMITER ;
 CALL updateDb();
 DROP PROCEDURE IF EXISTS `updateDb`;
diff --git a/data/sql/updates/db_world/2017_06_14_00.sql b/data/sql/updates/db_world/2017_06_14_00.sql
index cc1db6857..98f023b74 100644
--- a/data/sql/updates/db_world/2017_06_14_00.sql
+++ b/data/sql/updates/db_world/2017_06_14_00.sql
@@ -30,8 +30,7 @@ INSERT INTO `creature_text` VALUES (4967, 0, 0, 'Go with grace, and may the Lady
 -- END UPDATING QUERIES
 --
 COMMIT;
-END;
-//
+END //
 DELIMITER ;
 CALL updateDb();
 DROP PROCEDURE IF EXISTS `updateDb`;
diff --git a/data/sql/updates/db_world/2017_06_23_00.sql b/data/sql/updates/db_world/2017_06_23_00.sql
index 536d598f1..91732a59b 100644
--- a/data/sql/updates/db_world/2017_06_23_00.sql
+++ b/data/sql/updates/db_world/2017_06_23_00.sql
@@ -26,8 +26,7 @@ INSERT INTO `smart_scripts` (`entryorguid`,`source_type`,`id`,`link`,`event_type
 -- END UPDATING QUERIES
 --
 COMMIT;
-END;
-//
+END //
 DELIMITER ;
 CALL updateDb();
 DROP PROCEDURE IF EXISTS `updateDb`;
diff --git a/data/sql/updates/db_world/2017_06_27_00.sql b/data/sql/updates/db_world/2017_06_27_00.sql
index 258847636..db2e605ec 100644
--- a/data/sql/updates/db_world/2017_06_27_00.sql
+++ b/data/sql/updates/db_world/2017_06_27_00.sql
@@ -27,8 +27,7 @@ UPDATE `creature_template_addon` SET `auras`='48602' WHERE  `entry`=27292;
 -- END UPDATING QUERIES
 --
 COMMIT;
-END;
-//
+END //
 DELIMITER ;
 CALL updateDb();
 DROP PROCEDURE IF EXISTS `updateDb`;
diff --git a/data/sql/updates/db_world/2017_06_29_00.sql b/data/sql/updates/db_world/2017_06_29_00.sql
index 1d00520bd..cbb8634d0 100644
--- a/data/sql/updates/db_world/2017_06_29_00.sql
+++ b/data/sql/updates/db_world/2017_06_29_00.sql
@@ -24,8 +24,7 @@ INSERT INTO `spell_linked_spell` (`spell_trigger`, `spell_effect`, `type`, `comm
 -- END UPDATING QUERIES
 --
 COMMIT;
-END;
-//
+END //
 DELIMITER ;
 CALL updateDb();
 DROP PROCEDURE IF EXISTS `updateDb`;
diff --git a/data/sql/updates/db_world/2017_08_18_00.sql b/data/sql/updates/db_world/2017_08_18_00.sql
index bee4471ca..78fffe40c 100644
--- a/data/sql/updates/db_world/2017_08_18_00.sql
+++ b/data/sql/updates/db_world/2017_08_18_00.sql
@@ -20,8 +20,7 @@ UPDATE `creature_template` SET `modelid1` = '6485' WHERE `entry` = '7780';
 -- END UPDATING QUERIES
 --
 COMMIT;
-END;
-//
+END //
 DELIMITER ;
 CALL updateDb();
 DROP PROCEDURE IF EXISTS `updateDb`;
diff --git a/data/sql/updates/db_world/2017_08_18_01.sql b/data/sql/updates/db_world/2017_08_18_01.sql
index e2479f25f..2b5b09a82 100644
--- a/data/sql/updates/db_world/2017_08_18_01.sql
+++ b/data/sql/updates/db_world/2017_08_18_01.sql
@@ -27,8 +27,7 @@ INSERT INTO `smart_scripts` (`entryorguid`, `source_type`, `id`, `link`, `event_
 -- END UPDATING QUERIES
 --
 COMMIT;
-END;
-//
+END //
 DELIMITER ;
 CALL updateDb();
 DROP PROCEDURE IF EXISTS `updateDb`;
diff --git a/data/sql/updates/db_world/2017_08_18_02.sql b/data/sql/updates/db_world/2017_08_18_02.sql
index 6dea4971f..0fdde66f9 100644
--- a/data/sql/updates/db_world/2017_08_18_02.sql
+++ b/data/sql/updates/db_world/2017_08_18_02.sql
@@ -23,8 +23,7 @@ UPDATE `quest_template_addon` SET `SpecialFlags` = '0' WHERE `ID` = '342';--
 -- END UPDATING QUERIES
 --
 COMMIT;
-END;
-//
+END //
 DELIMITER ;
 CALL updateDb();
 DROP PROCEDURE IF EXISTS `updateDb`;
diff --git a/data/sql/updates/db_world/2017_08_18_03.sql b/data/sql/updates/db_world/2017_08_18_03.sql
index 01aa65afd..1cc14942e 100644
--- a/data/sql/updates/db_world/2017_08_18_03.sql
+++ b/data/sql/updates/db_world/2017_08_18_03.sql
@@ -128,8 +128,7 @@ INSERT INTO `smart_scripts` (`entryorguid`,`source_type`,`id`,`link`,`event_type
 -- END UPDATING QUERIES
 --
 COMMIT;
-END;
-//
+END //
 DELIMITER ;
 CALL updateDb();
 DROP PROCEDURE IF EXISTS `updateDb`;
diff --git a/data/sql/updates/db_world/2017_08_19_00.sql b/data/sql/updates/db_world/2017_08_19_00.sql
index d171c2fe2..0bf643d98 100644
--- a/data/sql/updates/db_world/2017_08_19_00.sql
+++ b/data/sql/updates/db_world/2017_08_19_00.sql
@@ -30,8 +30,7 @@ UPDATE `quest_template`
 -- END UPDATING QUERIES
 --
 COMMIT;
-END;
-//
+END //
 DELIMITER ;
 CALL updateDb();
 DROP PROCEDURE IF EXISTS `updateDb`;
diff --git a/data/sql/updates/db_world/2017_08_19_01.sql b/data/sql/updates/db_world/2017_08_19_01.sql
index 7ded5a444..057b03f47 100644
--- a/data/sql/updates/db_world/2017_08_19_01.sql
+++ b/data/sql/updates/db_world/2017_08_19_01.sql
@@ -22,8 +22,7 @@ UPDATE `creature_template` SET `AIName`= 'PetAI', `mindmg`=1360, `maxdmg`=1840,
 -- END UPDATING QUERIES
 --
 COMMIT;
-END;
-//
+END //
 DELIMITER ;
 CALL updateDb();
 DROP PROCEDURE IF EXISTS `updateDb`;
diff --git a/data/sql/updates/db_world/2017_08_19_02.sql b/data/sql/updates/db_world/2017_08_19_02.sql
index a3e5ae184..436a53f04 100644
--- a/data/sql/updates/db_world/2017_08_19_02.sql
+++ b/data/sql/updates/db_world/2017_08_19_02.sql
@@ -207,8 +207,7 @@ INSERT INTO `game_event_gameobject` (`guid`, `eventEntry`) VALUES
 -- END UPDATING QUERIES
 --
 COMMIT;
-END;
-//
+END //
 DELIMITER ;
 CALL updateDb();
 DROP PROCEDURE IF EXISTS `updateDb`;
diff --git a/data/sql/updates/db_world/2017_08_19_03.sql b/data/sql/updates/db_world/2017_08_19_03.sql
index 2e5df34ea..0bc83b398 100644
--- a/data/sql/updates/db_world/2017_08_19_03.sql
+++ b/data/sql/updates/db_world/2017_08_19_03.sql
@@ -32,8 +32,7 @@ INSERT INTO `creature_text` (`entry`, `groupid`, `id`, `text`, `type`, `language
 -- END UPDATING QUERIES
 --
 COMMIT;
-END;
-//
+END //
 DELIMITER ;
 CALL updateDb();
 DROP PROCEDURE IF EXISTS `updateDb`;
diff --git a/data/sql/updates/db_world/2017_08_19_04.sql b/data/sql/updates/db_world/2017_08_19_04.sql
index 97256b245..b58f1167a 100644
--- a/data/sql/updates/db_world/2017_08_19_04.sql
+++ b/data/sql/updates/db_world/2017_08_19_04.sql
@@ -32,8 +32,7 @@ INSERT INTO `creature_text` (`entry`, `groupid`, `id`, `text`, `type`, `language
 -- END UPDATING QUERIES
 --
 COMMIT;
-END;
-//
+END //
 DELIMITER ;
 CALL updateDb();
 DROP PROCEDURE IF EXISTS `updateDb`;
diff --git a/data/sql/updates/db_world/2017_08_19_05.sql b/data/sql/updates/db_world/2017_08_19_05.sql
index 22288d84d..c641dbf16 100644
--- a/data/sql/updates/db_world/2017_08_19_05.sql
+++ b/data/sql/updates/db_world/2017_08_19_05.sql
@@ -41,8 +41,7 @@ INSERT INTO `creature_text` (`entry`, `groupid`, `id`, `text`, `type`, `language
 -- END UPDATING QUERIES
 --
 COMMIT;
-END;
-//
+END //
 DELIMITER ;
 CALL updateDb();
 DROP PROCEDURE IF EXISTS `updateDb`;
diff --git a/data/sql/updates/db_world/2017_08_19_06.sql b/data/sql/updates/db_world/2017_08_19_06.sql
index 18cdb92df..e7a1dad92 100644
--- a/data/sql/updates/db_world/2017_08_19_06.sql
+++ b/data/sql/updates/db_world/2017_08_19_06.sql
@@ -115,8 +115,7 @@ INSERT INTO `creature_text` (`entry`,`groupid`,`id`,`text`,`type`,`language`,`pr
 -- END UPDATING QUERIES
 --
 COMMIT;
-END;
-//
+END //
 DELIMITER ;
 CALL updateDb();
 DROP PROCEDURE IF EXISTS `updateDb`;
diff --git a/data/sql/updates/db_world/2017_08_19_07.sql b/data/sql/updates/db_world/2017_08_19_07.sql
index e8a0e22f9..ef2dc707d 100644
--- a/data/sql/updates/db_world/2017_08_19_07.sql
+++ b/data/sql/updates/db_world/2017_08_19_07.sql
@@ -246,8 +246,7 @@ INSERT INTO `waypoints` (`entry`, `pointid`, `position_x`, `position_y`, `positi
 -- END UPDATING QUERIES
 --
 COMMIT;
-END;
-//
+END //
 DELIMITER ;
 CALL updateDb();
 DROP PROCEDURE IF EXISTS `updateDb`;
diff --git a/data/sql/updates/db_world/2017_08_19_08.sql b/data/sql/updates/db_world/2017_08_19_08.sql
index bd5c05c96..274fbb2f0 100644
--- a/data/sql/updates/db_world/2017_08_19_08.sql
+++ b/data/sql/updates/db_world/2017_08_19_08.sql
@@ -23,8 +23,7 @@ WHERE `ID`= 5064;
 -- END UPDATING QUERIES
 --
 COMMIT;
-END;
-//
+END //
 DELIMITER ;
 CALL updateDb();
 DROP PROCEDURE IF EXISTS `updateDb`;
diff --git a/data/sql/updates/db_world/2017_08_19_09.sql b/data/sql/updates/db_world/2017_08_19_09.sql
index 2650ba0ff..d029590da 100644
--- a/data/sql/updates/db_world/2017_08_19_09.sql
+++ b/data/sql/updates/db_world/2017_08_19_09.sql
@@ -19,8 +19,7 @@ UPDATE `spell_dbc` SET `RangeIndex`=4 WHERE `Id`=61698;
 -- END UPDATING QUERIES
 --
 COMMIT;
-END;
-//
+END //
 DELIMITER ;
 CALL updateDb();
 DROP PROCEDURE IF EXISTS `updateDb`;
diff --git a/data/sql/updates/db_world/2017_08_19_10.sql b/data/sql/updates/db_world/2017_08_19_10.sql
index 918ed8112..45b18a593 100644
--- a/data/sql/updates/db_world/2017_08_19_10.sql
+++ b/data/sql/updates/db_world/2017_08_19_10.sql
@@ -19,8 +19,7 @@ UPDATE `creature_template` SET `faction` = 1873 WHERE `entry` = 16927;
 -- END UPDATING QUERIES
 --
 COMMIT;
-END;
-//
+END //
 DELIMITER ;
 CALL updateDb();
 DROP PROCEDURE IF EXISTS `updateDb`;
diff --git a/data/sql/updates/db_world/2017_08_19_11.sql b/data/sql/updates/db_world/2017_08_19_11.sql
index a2488b627..6416bcee5 100644
--- a/data/sql/updates/db_world/2017_08_19_11.sql
+++ b/data/sql/updates/db_world/2017_08_19_11.sql
@@ -62,8 +62,7 @@ INSERT INTO `smart_scripts` (`entryorguid`,`source_type`,`id`,`link`,`event_type
 -- END UPDATING QUERIES
 --
 COMMIT;
-END;
-//
+END //
 DELIMITER ;
 CALL updateDb();
 DROP PROCEDURE IF EXISTS `updateDb`;
diff --git a/data/sql/updates/db_world/2017_08_19_12.sql b/data/sql/updates/db_world/2017_08_19_12.sql
index 0ae38e1d4..1fd5b1b45 100644
--- a/data/sql/updates/db_world/2017_08_19_12.sql
+++ b/data/sql/updates/db_world/2017_08_19_12.sql
@@ -24,8 +24,7 @@ INSERT INTO `creature_onkill_reputation` (`creature_id`,`RewOnKillRepFaction1`,`
 -- END UPDATING QUERIES
 --
 COMMIT;
-END;
-//
+END //
 DELIMITER ;
 CALL updateDb();
 DROP PROCEDURE IF EXISTS `updateDb`;
diff --git a/data/sql/updates/db_world/2017_08_19_13.sql b/data/sql/updates/db_world/2017_08_19_13.sql
index ce8e5b1ed..2e250ba35 100644
--- a/data/sql/updates/db_world/2017_08_19_13.sql
+++ b/data/sql/updates/db_world/2017_08_19_13.sql
@@ -41,8 +41,7 @@ UPDATE `creature` SET `position_x`=4402.431152, `position_y`=4554.557129, `posit
 -- END UPDATING QUERIES
 --
 COMMIT;
-END;
-//
+END //
 DELIMITER ;
 CALL updateDb();
 DROP PROCEDURE IF EXISTS `updateDb`;
diff --git a/data/sql/updates/db_world/2017_08_19_14.sql b/data/sql/updates/db_world/2017_08_19_14.sql
index a2042bb15..76b2c3a4f 100644
--- a/data/sql/updates/db_world/2017_08_19_14.sql
+++ b/data/sql/updates/db_world/2017_08_19_14.sql
@@ -42,8 +42,7 @@ UPDATE `quest_template` SET RewardXPDifficulty = 0, RewardBonusMoney =    0 WHER
 -- END UPDATING QUERIES
 --
 COMMIT;
-END;
-//
+END //
 DELIMITER ;
 CALL updateDb();
 DROP PROCEDURE IF EXISTS `updateDb`;
diff --git a/data/sql/updates/db_world/2017_08_19_15.sql b/data/sql/updates/db_world/2017_08_19_15.sql
index 7f933125e..638bbf683 100644
--- a/data/sql/updates/db_world/2017_08_19_15.sql
+++ b/data/sql/updates/db_world/2017_08_19_15.sql
@@ -166,8 +166,7 @@ UPDATE `item_loot_template` SET `ChanceOrQuestChance` = 100 WHERE `entry` = 1056
 -- END UPDATING QUERIES
 --
 COMMIT;
-END;
-//
+END //
 DELIMITER ;
 CALL updateDb();
 DROP PROCEDURE IF EXISTS `updateDb`;
diff --git a/data/sql/updates/db_world/2017_08_19_16.sql b/data/sql/updates/db_world/2017_08_19_16.sql
index 73d1ba7d9..5a35ef619 100644
--- a/data/sql/updates/db_world/2017_08_19_16.sql
+++ b/data/sql/updates/db_world/2017_08_19_16.sql
@@ -97,8 +97,7 @@ UPDATE `creature_loot_template` SET `ChanceOrQuestChance` = 15 WHERE `item` = 24
 -- END UPDATING QUERIES
 --
 COMMIT;
-END;
-//
+END //
 DELIMITER ;
 CALL updateDb();
 DROP PROCEDURE IF EXISTS `updateDb`;
diff --git a/data/sql/updates/db_world/2017_08_19_17.sql b/data/sql/updates/db_world/2017_08_19_17.sql
index 75e791cb5..4d04398a0 100644
--- a/data/sql/updates/db_world/2017_08_19_17.sql
+++ b/data/sql/updates/db_world/2017_08_19_17.sql
@@ -298,8 +298,7 @@ INSERT INTO `smart_scripts` (`entryorguid`,`source_type`,`id`,`link`,`event_type
 -- END UPDATING QUERIES
 --
 COMMIT;
-END;
-//
+END //
 DELIMITER ;
 CALL updateDb();
 DROP PROCEDURE IF EXISTS `updateDb`;
diff --git a/data/sql/updates/db_world/2017_08_19_18.sql b/data/sql/updates/db_world/2017_08_19_18.sql
index e17f62ffd..9585764d6 100644
--- a/data/sql/updates/db_world/2017_08_19_18.sql
+++ b/data/sql/updates/db_world/2017_08_19_18.sql
@@ -22,8 +22,7 @@ UPDATE creature_equip_template SET ItemID1= 38723, ItemID2= 12932 WHERE Creature
 -- END UPDATING QUERIES
 --
 COMMIT;
-END;
-//
+END //
 DELIMITER ;
 CALL updateDb();
 DROP PROCEDURE IF EXISTS `updateDb`;
diff --git a/data/sql/updates/db_world/2017_08_19_19.sql b/data/sql/updates/db_world/2017_08_19_19.sql
index ac2056bd8..5371e951f 100644
--- a/data/sql/updates/db_world/2017_08_19_19.sql
+++ b/data/sql/updates/db_world/2017_08_19_19.sql
@@ -298,8 +298,7 @@ INSERT INTO `smart_scripts` (`entryorguid`,`source_type`,`id`,`link`,`event_type
 -- END UPDATING QUERIES
 --
 COMMIT;
-END;
-//
+END //
 DELIMITER ;
 CALL updateDb();
 DROP PROCEDURE IF EXISTS `updateDb`;
diff --git a/data/sql/updates/db_world/2017_08_20_00.sql b/data/sql/updates/db_world/2017_08_20_00.sql
index ad1bd8c62..9174e6f5e 100644
--- a/data/sql/updates/db_world/2017_08_20_00.sql
+++ b/data/sql/updates/db_world/2017_08_20_00.sql
@@ -26,8 +26,7 @@ INSERT INTO `command` (`name`,`security`,`help`) VALUES
 -- END UPDATING QUERIES
 --
 COMMIT;
-END;
-//
+END //
 DELIMITER ;
 CALL updateDb();
 DROP PROCEDURE IF EXISTS `updateDb`;
diff --git a/data/sql/updates/db_world/2017_08_20_01.sql b/data/sql/updates/db_world/2017_08_20_01.sql
index 31c12794c..492779b4f 100644
--- a/data/sql/updates/db_world/2017_08_20_01.sql
+++ b/data/sql/updates/db_world/2017_08_20_01.sql
@@ -26,8 +26,7 @@ INSERT INTO `command` (`name`,`security`,`help`) VALUES
 -- END UPDATING QUERIES
 --
 COMMIT;
-END;
-//
+END //
 DELIMITER ;
 CALL updateDb();
 DROP PROCEDURE IF EXISTS `updateDb`;
diff --git a/data/sql/updates/db_world/2017_08_22_00.sql b/data/sql/updates/db_world/2017_08_22_00.sql
index 241b29a81..79e931126 100644
--- a/data/sql/updates/db_world/2017_08_22_00.sql
+++ b/data/sql/updates/db_world/2017_08_22_00.sql
@@ -23,8 +23,7 @@ UPDATE `creature_template_addon` SET `auras`=10848 WHERE `entry` IN (8888);
 -- END UPDATING QUERIES
 --
 COMMIT;
-END;
-//
+END //
 DELIMITER ;
 CALL updateDb();
 DROP PROCEDURE IF EXISTS `updateDb`;
diff --git a/data/sql/updates/db_world/2017_08_22_01.sql b/data/sql/updates/db_world/2017_08_22_01.sql
index 4673f4e03..d2d38f103 100644
--- a/data/sql/updates/db_world/2017_08_22_01.sql
+++ b/data/sql/updates/db_world/2017_08_22_01.sql
@@ -32,8 +32,7 @@ INSERT INTO `conditions` (`SourceTypeOrReferenceId`,`SourceGroup`,`SourceEntry`,
 -- END UPDATING QUERIES
 --
 COMMIT;
-END;
-//
+END //
 DELIMITER ;
 CALL updateDb();
 DROP PROCEDURE IF EXISTS `updateDb`;
diff --git a/data/sql/updates/db_world/2017_08_25_00.sql b/data/sql/updates/db_world/2017_08_25_00.sql
index 87cb39f24..136d4ad4c 100644
--- a/data/sql/updates/db_world/2017_08_25_00.sql
+++ b/data/sql/updates/db_world/2017_08_25_00.sql
@@ -38,8 +38,7 @@ UPDATE `creature_text` SET `sound` = '10159' WHERE `entry` = '17461' AND `groupi
 -- END UPDATING QUERIES
 --
 COMMIT;
-END;
-//
+END //
 DELIMITER ;
 CALL updateDb();
 DROP PROCEDURE IF EXISTS `updateDb`;
diff --git a/data/sql/updates/db_world/2017_09_26_00.sql b/data/sql/updates/db_world/2017_09_26_00.sql
index 2427091d4..f93e472d5 100644
--- a/data/sql/updates/db_world/2017_09_26_00.sql
+++ b/data/sql/updates/db_world/2017_09_26_00.sql
@@ -28,8 +28,7 @@ UPDATE `creature_template` SET `AIName`='', `ScriptName`='boss_high_inquisitor_w
 -- END UPDATING QUERIES
 --
 COMMIT;
-END;
-//
+END //
 DELIMITER ;
 CALL updateDb();
 DROP PROCEDURE IF EXISTS `updateDb`;
diff --git a/data/sql/updates/db_world/2017_10_14_00.sql b/data/sql/updates/db_world/2017_10_14_00.sql
index 6d10dea7d..840175104 100644
--- a/data/sql/updates/db_world/2017_10_14_00.sql
+++ b/data/sql/updates/db_world/2017_10_14_00.sql
@@ -17,8 +17,7 @@ SELECT sql_rev INTO OK FROM version_db_world WHERE sql_rev = '150404422256069670
 -- END UPDATING QUERIES
 --
 COMMIT;
-END;
-//
+END //
 DELIMITER ;
 CALL updateDb();
 DROP PROCEDURE IF EXISTS `updateDb`;
diff --git a/data/sql/updates/db_world/2017_10_14_01.sql b/data/sql/updates/db_world/2017_10_14_01.sql
index e3c129409..04cc39888 100644
--- a/data/sql/updates/db_world/2017_10_14_01.sql
+++ b/data/sql/updates/db_world/2017_10_14_01.sql
@@ -17,8 +17,7 @@ SELECT sql_rev INTO OK FROM version_db_world WHERE sql_rev = '150470458210130820
 -- END UPDATING QUERIES
 --
 COMMIT;
-END;
-//
+END //
 DELIMITER ;
 CALL updateDb();
 DROP PROCEDURE IF EXISTS `updateDb`;
diff --git a/data/sql/updates/db_world/2017_10_14_02.sql b/data/sql/updates/db_world/2017_10_14_02.sql
index d24555d7e..039eac635 100644
--- a/data/sql/updates/db_world/2017_10_14_02.sql
+++ b/data/sql/updates/db_world/2017_10_14_02.sql
@@ -17,8 +17,7 @@ SELECT sql_rev INTO OK FROM version_db_world WHERE sql_rev = '150671908967015170
 -- END UPDATING QUERIES
 --
 COMMIT;
-END;
-//
+END //
 DELIMITER ;
 CALL updateDb();
 DROP PROCEDURE IF EXISTS `updateDb`;
diff --git a/data/sql/updates/db_world/2017_10_15_00.sql b/data/sql/updates/db_world/2017_10_15_00.sql
index 508359195..b0f9d5f6e 100644
--- a/data/sql/updates/db_world/2017_10_15_00.sql
+++ b/data/sql/updates/db_world/2017_10_15_00.sql
@@ -170,8 +170,7 @@ UPDATE game_event SET holidayStage = 2 WHERE eventEntry IN (3, 4, 5);
 -- END UPDATING QUERIES
 --
 COMMIT;
-END;
-//
+END //
 DELIMITER ;
 CALL updateDb();
 DROP PROCEDURE IF EXISTS `updateDb`;
diff --git a/data/sql/updates/db_world/2017_10_15_01.sql b/data/sql/updates/db_world/2017_10_15_01.sql
index 034759e50..010f1aa1f 100644
--- a/data/sql/updates/db_world/2017_10_15_01.sql
+++ b/data/sql/updates/db_world/2017_10_15_01.sql
@@ -52,8 +52,7 @@ INSERT INTO `creature_text` (`entry`, `groupid`, `id`, `text`, `type`, `language
 -- END UPDATING QUERIES
 --
 COMMIT;
-END;
-//
+END //
 DELIMITER ;
 CALL updateDb();
 DROP PROCEDURE IF EXISTS `updateDb`;
diff --git a/data/sql/updates/db_world/2017_10_15_02.sql b/data/sql/updates/db_world/2017_10_15_02.sql
index 79642109f..f9ea98278 100644
--- a/data/sql/updates/db_world/2017_10_15_02.sql
+++ b/data/sql/updates/db_world/2017_10_15_02.sql
@@ -20,8 +20,7 @@ UPDATE creature_template SET flags_extra =+ 2 WHERE entry IN (69,299);
 -- END UPDATING QUERIES
 --
 COMMIT;
-END;
-//
+END //
 DELIMITER ;
 CALL updateDb();
 DROP PROCEDURE IF EXISTS `updateDb`;
diff --git a/data/sql/updates/db_world/2017_10_17_00.sql b/data/sql/updates/db_world/2017_10_17_00.sql
index 51b39ef99..b34c1a3a8 100644
--- a/data/sql/updates/db_world/2017_10_17_00.sql
+++ b/data/sql/updates/db_world/2017_10_17_00.sql
@@ -32,8 +32,7 @@ INSERT INTO `creature_text` (`entry`,`groupid`,`id`,`text`,`type`,`language`,`pr
 -- END UPDATING QUERIES
 --
 COMMIT;
-END;
-//
+END //
 DELIMITER ;
 CALL updateDb();
 DROP PROCEDURE IF EXISTS `updateDb`;
diff --git a/data/sql/updates/db_world/2017_10_17_01.sql b/data/sql/updates/db_world/2017_10_17_01.sql
index d2ff1136a..a15b0c150 100644
--- a/data/sql/updates/db_world/2017_10_17_01.sql
+++ b/data/sql/updates/db_world/2017_10_17_01.sql
@@ -26,8 +26,7 @@ UPDATE `quest_template_addon` SET `ExclusiveGroup`=11585 WHERE `ID` IN (11585,11
 -- END UPDATING QUERIES
 --
 COMMIT;
-END;
-//
+END //
 DELIMITER ;
 CALL updateDb();
 DROP PROCEDURE IF EXISTS `updateDb`;
diff --git a/data/sql/updates/db_world/2017_10_17_02.sql b/data/sql/updates/db_world/2017_10_17_02.sql
index 0e74d57b3..ccad68b87 100644
--- a/data/sql/updates/db_world/2017_10_17_02.sql
+++ b/data/sql/updates/db_world/2017_10_17_02.sql
@@ -23,8 +23,7 @@ DELETE FROM `creature_addon` WHERE `guid`=3574;
 -- END UPDATING QUERIES
 --
 COMMIT;
-END;
-//
+END //
 DELIMITER ;
 CALL updateDb();
 DROP PROCEDURE IF EXISTS `updateDb`;
diff --git a/data/sql/updates/db_world/2017_11_14_00.sql b/data/sql/updates/db_world/2017_11_14_00.sql
index 9a05c7633..d5cc81382 100644
--- a/data/sql/updates/db_world/2017_11_14_00.sql
+++ b/data/sql/updates/db_world/2017_11_14_00.sql
@@ -28,8 +28,7 @@ INSERT INTO `creature_text` (`entry`,`GroupID`,`ID`,`Text`,`Type`,`Language`,`Pr
 -- END UPDATING QUERIES
 --
 COMMIT;
-END;
-//
+END //
 DELIMITER ;
 CALL updateDb();
 DROP PROCEDURE IF EXISTS `updateDb`;
diff --git a/data/sql/updates/db_world/2017_11_14_01.sql b/data/sql/updates/db_world/2017_11_14_01.sql
index 3f59c4d49..3206d9367 100644
--- a/data/sql/updates/db_world/2017_11_14_01.sql
+++ b/data/sql/updates/db_world/2017_11_14_01.sql
@@ -27,8 +27,7 @@ INSERT INTO `command` (`name`, `security`, `help`) VALUES
 -- END UPDATING QUERIES
 --
 COMMIT;
-END;
-//
+END //
 DELIMITER ;
 CALL updateDb();
 DROP PROCEDURE IF EXISTS `updateDb`;
diff --git a/data/sql/updates/db_world/2017_11_17_00.sql b/data/sql/updates/db_world/2017_11_17_00.sql
index d558c1169..38163ca74 100644
--- a/data/sql/updates/db_world/2017_11_17_00.sql
+++ b/data/sql/updates/db_world/2017_11_17_00.sql
@@ -55,8 +55,7 @@ INSERT INTO achievement_criteria_data (criteria_id,TYPE,ScriptName) VALUES (8598
 -- END UPDATING QUERIES
 --
 COMMIT;
-END;
-//
+END //
 DELIMITER ;
 CALL updateDb();
 DROP PROCEDURE IF EXISTS `updateDb`;