Merge branch 'master' of https://github.com/azerothcore/azerothcore-wotlk into dir-restructure

apps/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";
@@ -89,8 +91,7 @@ function import() {
             echo "$endTransaction" >> "$newFile";
 
             if [[ $isRev -eq 1 ]]; then
-                echo "END;" >> "$newFile";
-                echo "//" >> "$newFile";
+                echo "END //" >> "$newFile";
                 echo "DELIMITER ;" >> "$newFile";
                 echo "CALL updateDb();" >> "$newFile";
                 echo "DROP PROCEDURE IF EXISTS \`updateDb\`;" >> "$newFile";

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`;

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`;

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`;

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`;

data/sql/updates/db_auth/2017_12_05_00.sql

@@ -0,0 +1,35 @@
+-- DB update 2017_08_20_01 -> 2017_12_05_00
+DROP PROCEDURE IF EXISTS `updateDb`;
+DELIMITER //
+CREATE PROCEDURE updateDb ()
+proc:BEGIN DECLARE OK VARCHAR(100) DEFAULT 'FALSE';
+SELECT COUNT(*) INTO @COLEXISTS
+FROM information_schema.COLUMNS
+WHERE TABLE_SCHEMA = DATABASE() AND TABLE_NAME = 'version_db_auth' AND COLUMN_NAME = '2017_08_20_01';
+IF @COLEXISTS = 0 THEN LEAVE proc; END IF;
+START TRANSACTION;
+ALTER TABLE version_db_auth CHANGE COLUMN 2017_08_20_01 2017_12_05_00 bit;
+SELECT sql_rev INTO OK FROM version_db_auth WHERE sql_rev = '1511238042597856200'; IF OK <> 'FALSE' THEN LEAVE proc; END IF;
+--
+-- START UPDATING QUERIES
+--
+
+INSERT INTO version_db_auth (`sql_rev`) VALUES ('1511238042597856200');
+DROP TABLE IF EXISTS `uptime`;
+
+CREATE TABLE `uptime` (
+  `realmid` int(10) unsigned NOT NULL,
+  `starttime` int(10) unsigned NOT NULL DEFAULT '0',
+  `uptime` int(10) unsigned NOT NULL DEFAULT '0',
+  `maxplayers` smallint(5) unsigned NOT NULL DEFAULT '0',
+  `revision` varchar(255) NOT NULL DEFAULT 'AzerothCore',
+  PRIMARY KEY (`realmid`,`starttime`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8 COMMENT='Uptime system';
+--
+-- END UPDATING QUERIES
+--
+COMMIT;
+END //
+DELIMITER ;
+CALL updateDb();
+DROP PROCEDURE IF EXISTS `updateDb`;

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`;

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`;

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`;

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`;

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`;

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`;

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`;

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`;

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`;

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`;

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`;

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`;

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`;

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`;

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`;

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`;

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`;

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`;

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`;

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`;

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`;

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`;

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`;

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`;

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`;

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`;

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`;

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`;

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`;

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`;

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`;

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`;

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`;

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`;

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`;

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`;

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`;

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`;

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`;

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`;

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`;

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`;

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`;

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`;

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`;

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`;

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`;

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`;

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`;

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`;

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`;

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`;

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`;

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`;

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`;

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`;

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`;

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`;

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`;

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`;

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`;

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`;

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`;

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`;

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`;

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`;

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`;

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`;

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`;

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`;

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`;

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`;

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`;

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`;

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`;

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`;

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`;

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`;

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`;

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`;

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`;

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`;

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`;

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`;

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`;

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`;

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`;

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`;

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`;

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`;

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`;

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`;

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`;

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`;