TDB 6.0.1 - 2015/03/21TDB6.01

Closes #13816
Closes #13792

Ref #14139

245 files changed, 1921 insertions, 929 deletions

diff --git a/revision.h.in.cmake b/revision.h.in.cmake
index c0eb651489f..f5f06b0f46d 100644
--- a/revision.h.in.cmake
+++ b/revision.h.in.cmake
@@ -5,7 +5,8 @@
  #define _BRANCH                    "@rev_branch@"
  #define _SOURCE_DIRECTORY          "@CMAKE_SOURCE_DIR@"
  #define _MYSQL_EXECUTABLE          "@MYSQL_EXECUTABLE@"
- #define _FULL_DATABASE             "TDB_full_6.00_2014_10_19.sql"
+ #define _FULL_DATABASE             "TDB_full_6.01_2015_03_21.sql"
+ #define _HOTFIXES_DATABASE         "TDB_hotfixes_6.01_2015_03_21.sql"
  #define VER_COMPANYNAME_STR        "TrinityCore Developers"
  #define VER_LEGALCOPYRIGHT_STR     "(c)2008-2015 TrinityCore"
  #define VER_FILEVERSION            0,0,0
diff --git a/sql/base/auth_database.sql b/sql/base/auth_database.sql
index d4bc9246ed2..61bd761133b 100644
--- a/sql/base/auth_database.sql
+++ b/sql/base/auth_database.sql
@@ -1,8 +1,8 @@
--- MySQL dump 10.15  Distrib 10.0.15-MariaDB, for Win64 (x86)
+-- MySQL dump 10.13  Distrib 5.6.9-rc, for Win64 (x86_64)
 --
 -- Host: localhost    Database: auth
 -- ------------------------------------------------------
--- Server version   10.0.15-MariaDB
+-- Server version	5.6.9-rc
 
 /*!40101 SET @OLD_CHARACTER_SET_CLIENT=@@CHARACTER_SET_CLIENT */;
 /*!40101 SET @OLD_CHARACTER_SET_RESULTS=@@CHARACTER_SET_RESULTS */;
@@ -468,7 +468,7 @@ CREATE TABLE `rbac_default_permissions` (
 
 LOCK TABLES `rbac_default_permissions` WRITE;
 /*!40000 ALTER TABLE `rbac_default_permissions` DISABLE KEYS */;
-INSERT INTO `rbac_default_permissions` VALUES (0,195,-1),(1,194,-1),(2,193,-1),(3,192,-1);
+INSERT INTO `rbac_default_permissions` VALUES (3,192,-1),(2,193,-1),(1,194,-1),(0,195,-1);
 /*!40000 ALTER TABLE `rbac_default_permissions` ENABLE KEYS */;
 UNLOCK TABLES;
 
@@ -573,7 +573,7 @@ CREATE TABLE `realmlist` (
   `Battlegroup` tinyint(3) unsigned NOT NULL DEFAULT '1',
   PRIMARY KEY (`id`),
   UNIQUE KEY `idx_name` (`name`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8 COMMENT='Realm System';
+) ENGINE=InnoDB AUTO_INCREMENT=2 DEFAULT CHARSET=utf8 COMMENT='Realm System';
 /*!40101 SET character_set_client = @saved_cs_client */;
 
 --
@@ -587,6 +587,57 @@ INSERT INTO `realmlist` VALUES (1,'Trinity','127.0.0.1','127.0.0.1','255.255.255
 UNLOCK TABLES;
 
 --
+-- Table structure for table `updates`
+--
+
+DROP TABLE IF EXISTS `updates`;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `updates` (
+  `name` varchar(200) NOT NULL COMMENT 'filename with extension of the update.',
+  `hash` char(40) DEFAULT '' COMMENT 'sha1 hash of the sql file.',
+  `state` enum('RELEASED','ARCHIVED') NOT NULL DEFAULT 'RELEASED' COMMENT 'defines if an update is released or archived.',
+  `timestamp` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT 'timestamp when the query was applied.',
+  `speed` int(10) unsigned NOT NULL DEFAULT '0' COMMENT 'time the query takes to apply in ms.',
+  PRIMARY KEY (`name`)
+) ENGINE=MyISAM DEFAULT CHARSET=utf8 COMMENT='List of all applied updates in this database.';
+/*!40101 SET character_set_client = @saved_cs_client */;
+
+--
+-- Dumping data for table `updates`
+--
+
+LOCK TABLES `updates` WRITE;
+/*!40000 ALTER TABLE `updates` DISABLE KEYS */;
+INSERT INTO `updates` VALUES ('2014_10_04_00_auth.sql','C3BC70A6EC381474B7308F442346F1E721176BC6','ARCHIVED','2015-03-21 16:55:52',0),('2014_10_19_00_auth.sql','7472B490A4F86C9D3DA609CDD3197499CB80C87C','ARCHIVED','2015-03-21 16:55:52',0),('2014_10_26_00_auth.sql','75CC67ADE2A3B2E54FD57D6B0DCAA8FE50F4EE35','ARCHIVED','2015-03-21 16:55:52',0),('2014_11_03_00_auth.sql','5948C9F286CF0FEA8E241785C0259FF36B73BDC5','ARCHIVED','2015-03-21 16:55:52',0),('2014_11_04_00_auth.sql','3AFC68B2375C2A417DDEA94583C53AFF83DE50DF','ARCHIVED','2015-03-21 16:55:52',0),('2014_11_09_00_auth.sql','B8DD1A7047C0FDDB80344B239343EC33BF1A0D97','ARCHIVED','2015-03-21 16:55:52',0),('2014_11_10_00_auth.sql','8FBA737A1D3FF4631A1E662A5B500A8BD304EC63','ARCHIVED','2015-03-21 16:55:52',0),('2014_11_10_00_auth_from_335.sql','0E3CB119442D09DD88E967015319BBC8DAFBBFE0','ARCHIVED','2015-03-21 16:55:52',0),('2014_11_10_01_auth.sql','327E77A1DA3546D5275AB249915DD57EDD6FDD3D','ARCHIVED','2015-03-21 16:55:52',0),('2014_11_23_00_auth.sql','0BBEB3EB3AED0FEF277A062819B6B2C00084A742','ARCHIVED','2015-03-21 16:55:52',0),('2014_11_25_00_auth.sql','4F45CDB26BDBB3EE83F1988E3D7818C5926ADC02','ARCHIVED','2015-03-21 16:55:52',0),('2014_12_05_00_auth.sql','6A7BBCEF43111C73A2D2C3CCB6911BE50DE7DD94','ARCHIVED','2015-03-21 16:55:52',0),('2014_12_10_00_auth.sql','821703A96D80F9080074852B5A46E2909C9562EA','ARCHIVED','2015-03-21 16:55:52',0),('2014_12_19_00_auth.sql','44D8E12FFF327AD07878FBDF8D9C16B6B7DCB122','ARCHIVED','2015-03-21 16:55:52',0),('2014_12_20_00_auth.sql','4DAA02AE285C02AE6C82EA2C8B97AC71990F1085','ARCHIVED','2015-03-21 16:55:52',0),('2014_12_25_00_auth.sql','61411930F482BC73FC7FD2C370C811E944F5FF92','ARCHIVED','2015-03-21 16:55:52',0),('2014_12_27_00_auth.sql','CE2E5D2CD82E79C25294539ADED27A1429105B43','ARCHIVED','2015-03-21 16:55:52',0),('2014_12_28_00_auth.sql','0A913217610E76AFF119C27259737BBC523090E6','ARCHIVED','2015-03-21 16:55:52',0),('2015_02_22_00_auth.sql','21CCCF8B01252E16CA3D6C9E3E8DAA4C9B28ED6E','ARCHIVED','2015-03-21 16:55:52',0),('2015_03_01_00_auth.sql','911881E273207FF6182D1FDAC8C85FFAE8F1C852','ARCHIVED','2015-03-21 16:55:52',0),('2015_03_10_00_auth.sql','2CC8502C11412EFEB5C11BE166761A8754A59009','ARCHIVED','2015-03-21 16:55:52',0),('2015_03_20_00_auth.sql','B761760804EA73BD297F296C5C1919687DF7191C','ARCHIVED','2015-03-21 16:55:52',0),('2015_03_20_01_auth.sql','5CCEDF20C8189FB1E8DF064A9F0DDC342841FBF0','ARCHIVED','2015-03-21 16:55:52',0),('2015_03_20_02_auth.sql','85E4ACD9AA099C0C4AC034575F2BB07D348EAC72','ARCHIVED','2015-03-21 16:56:46',0);
+/*!40000 ALTER TABLE `updates` ENABLE KEYS */;
+UNLOCK TABLES;
+
+--
+-- Table structure for table `updates_include`
+--
+
+DROP TABLE IF EXISTS `updates_include`;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `updates_include` (
+  `path` varchar(200) NOT NULL COMMENT 'directory to include. $ means relative to the source directory.',
+  `state` enum('RELEASED','ARCHIVED') NOT NULL DEFAULT 'RELEASED' COMMENT 'defines if the directory contains released or archived updates.',
+  PRIMARY KEY (`path`)
+) ENGINE=MyISAM DEFAULT CHARSET=utf8 COMMENT='List of directories where we want to include sql updates.';
+/*!40101 SET character_set_client = @saved_cs_client */;
+
+--
+-- Dumping data for table `updates_include`
+--
+
+LOCK TABLES `updates_include` WRITE;
+/*!40000 ALTER TABLE `updates_include` DISABLE KEYS */;
+INSERT INTO `updates_include` VALUES ('$/sql/updates/auth','RELEASED'),('$/sql/custom/auth','RELEASED'),('$/sql/old/6.x/auth','ARCHIVED');
+/*!40000 ALTER TABLE `updates_include` ENABLE KEYS */;
+UNLOCK TABLES;
+
+--
 -- Table structure for table `uptime`
 --
 
@@ -621,61 +672,4 @@ UNLOCK TABLES;
 /*!40101 SET COLLATION_CONNECTION=@OLD_COLLATION_CONNECTION */;
 /*!40111 SET SQL_NOTES=@OLD_SQL_NOTES */;
 
--- Dump completed on 2014-12-28 23:10:07
-
--- Updates base tables
-DROP TABLE IF EXISTS `updates`;
-CREATE TABLE `updates` (
-    `name` VARCHAR(200) NOT NULL COMMENT 'filename with extension of the update.',
-    `hash` CHAR(40) NULL DEFAULT '' COMMENT 'sha1 hash of the sql file.',
-    `state` ENUM('RELEASED','ARCHIVED') NOT NULL DEFAULT 'RELEASED' COMMENT 'defines if an update is released or archived.',
-    `timestamp` TIMESTAMP NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT 'timestamp when the query was applied.',
-    `speed` INT(10) UNSIGNED NOT NULL DEFAULT 0 COMMENT 'time the query takes to apply in ms.',
-    PRIMARY KEY (`name`)
-)
-COMMENT='List of all applied updates in this database.'
-COLLATE='utf8_general_ci'
-ENGINE=MyISAM;
-
-DROP TABLE IF EXISTS `updates_include`;
-CREATE TABLE `updates_include` (
-    `path` VARCHAR(200) NOT NULL COMMENT 'directory to include. $ means relative to the source directory.',
-    `state` ENUM('RELEASED','ARCHIVED') NOT NULL DEFAULT 'RELEASED' COMMENT 'defines if the directory contains released or archived updates.',
-    PRIMARY KEY (`path`)
-)
-COMMENT='List of directories where we want to include sql updates.'
-COLLATE='utf8_general_ci'
-ENGINE=MyISAM;
-
--- Auth database update data
-TRUNCATE TABLE `updates_include`;
-INSERT INTO `updates_include` (`path`, `state`) VALUES
-('$/sql/updates/auth', 'RELEASED'),
-('$/sql/custom/auth', 'RELEASED'),
-('$/sql/old/6.x/auth', 'ARCHIVED');
-
-INSERT IGNORE INTO `updates` (`name`, `hash`) VALUES
-('2014_10_04_00_auth.sql', 'C3BC70A6EC381474B7308F442346F1E721176BC6'),
-('2014_10_19_00_auth.sql', '7472B490A4F86C9D3DA609CDD3197499CB80C87C'),
-('2014_10_26_00_auth.sql', '75CC67ADE2A3B2E54FD57D6B0DCAA8FE50F4EE35'),
-('2014_11_03_00_auth.sql', '5948C9F286CF0FEA8E241785C0259FF36B73BDC5'),
-('2014_11_04_00_auth.sql', '3AFC68B2375C2A417DDEA94583C53AFF83DE50DF'),
-('2014_11_09_00_auth.sql', 'B8DD1A7047C0FDDB80344B239343EC33BF1A0D97'),
-('2014_11_10_00_auth.sql', '8FBA737A1D3FF4631A1E662A5B500A8BD304EC63'),
-('2014_11_10_00_auth_from_335.sql', '0E3CB119442D09DD88E967015319BBC8DAFBBFE0'),
-('2014_11_10_01_auth.sql', '327E77A1DA3546D5275AB249915DD57EDD6FDD3D'),
-('2014_11_23_00_auth.sql', '0BBEB3EB3AED0FEF277A062819B6B2C00084A742'),
-('2014_11_25_00_auth.sql', '4F45CDB26BDBB3EE83F1988E3D7818C5926ADC02'),
-('2014_12_05_00_auth.sql', '6A7BBCEF43111C73A2D2C3CCB6911BE50DE7DD94'),
-('2014_12_10_00_auth.sql', '821703A96D80F9080074852B5A46E2909C9562EA'),
-('2014_12_19_00_auth.sql', '44D8E12FFF327AD07878FBDF8D9C16B6B7DCB122'),
-('2014_12_20_00_auth.sql', '4DAA02AE285C02AE6C82EA2C8B97AC71990F1085'),
-('2014_12_25_00_auth.sql', '61411930F482BC73FC7FD2C370C811E944F5FF92'),
-('2014_12_27_00_auth.sql', 'CE2E5D2CD82E79C25294539ADED27A1429105B43'),
-('2014_12_28_00_auth.sql', '0A913217610E76AFF119C27259737BBC523090E6'),
-('2015_02_22_00_auth.sql', '21CCCF8B01252E16CA3D6C9E3E8DAA4C9B28ED6E'),
-('2015_03_01_00_auth.sql', '911881E273207FF6182D1FDAC8C85FFAE8F1C852'),
-('2015_03_10_00_auth.sql', '2CC8502C11412EFEB5C11BE166761A8754A59009'),
-('2015_03_20_00_auth.sql', 'B761760804EA73BD297F296C5C1919687DF7191C'),
-('2015_03_20_01_auth.sql', '5CCEDF20C8189FB1E8DF064A9F0DDC342841FBF0'),
-('2015_03_20_02_auth.sql', '');
+-- Dump completed on 2015-03-21 17:03:45
diff --git a/sql/base/characters_database.sql b/sql/base/characters_database.sql
index 69c367a56c8..325f6978f6e 100644
--- a/sql/base/characters_database.sql
+++ b/sql/base/characters_database.sql
@@ -1,8 +1,8 @@
--- MySQL dump 10.13  Distrib 5.5.40, for debian-linux-gnu (x86_64)
+-- MySQL dump 10.13  Distrib 5.6.9-rc, for Win64 (x86_64)
 --
--- Host: localhost    Database: characters_4x
+-- Host: localhost    Database: characters
 -- ------------------------------------------------------
--- Server version	5.5.40-0ubuntu0.14.04.1
+-- Server version	5.6.9-rc
 
 /*!40101 SET @OLD_CHARACTER_SET_CLIENT=@@CHARACTER_SET_CLIENT */;
 /*!40101 SET @OLD_CHARACTER_SET_RESULTS=@@CHARACTER_SET_RESULTS */;
@@ -1626,20 +1626,20 @@ DROP TABLE IF EXISTS `gm_bug`;
 /*!40101 SET @saved_cs_client     = @@character_set_client */;
 /*!40101 SET character_set_client = utf8 */;
 CREATE TABLE `gm_bug` (
-  `id` INT(10) UNSIGNED NOT NULL,
-  `playerGuid` BIGINT(20) UNSIGNED NOT NULL,
-  `note` TEXT NOT NULL,
-  `createTime` INT(10) UNSIGNED NOT NULL DEFAULT '0',
-  `mapId` SMALLINT(5) UNSIGNED NOT NULL DEFAULT '0',
-  `posX` FLOAT NOT NULL DEFAULT '0',
-  `posY` FLOAT NOT NULL DEFAULT '0',
-  `posZ` FLOAT NOT NULL DEFAULT '0',
-  `facing` FLOAT NOT NULL DEFAULT '0',
-  `closedBy` BIGINT(20) NOT NULL DEFAULT '0',
-  `assignedTo` BIGINT(20) UNSIGNED NOT NULL DEFAULT '0' COMMENT 'GUID of admin to whom ticket is assigned',
-  `comment` TEXT NOT NULL,
+  `id` int(10) unsigned NOT NULL,
+  `playerGuid` bigint(20) unsigned NOT NULL,
+  `note` text NOT NULL,
+  `createTime` int(10) unsigned NOT NULL DEFAULT '0',
+  `mapId` smallint(5) unsigned NOT NULL DEFAULT '0',
+  `posX` float NOT NULL DEFAULT '0',
+  `posY` float NOT NULL DEFAULT '0',
+  `posZ` float NOT NULL DEFAULT '0',
+  `facing` float NOT NULL DEFAULT '0',
+  `closedBy` bigint(20) NOT NULL DEFAULT '0',
+  `assignedTo` bigint(20) unsigned NOT NULL DEFAULT '0' COMMENT 'GUID of admin to whom ticket is assigned',
+  `comment` text NOT NULL,
   PRIMARY KEY (`id`)
-) COLLATE='utf8_general_ci' ENGINE=InnoDB;
+) ENGINE=InnoDB DEFAULT CHARSET=utf8;
 /*!40101 SET character_set_client = @saved_cs_client */;
 
 --
@@ -1659,23 +1659,23 @@ DROP TABLE IF EXISTS `gm_complaint`;
 /*!40101 SET @saved_cs_client     = @@character_set_client */;
 /*!40101 SET character_set_client = utf8 */;
 CREATE TABLE `gm_complaint` (
-  `id` INT(10) UNSIGNED NOT NULL,
-  `playerGuid` BIGINT(20) UNSIGNED NOT NULL,
-  `note` TEXT NOT NULL,
-  `createTime` INT(10) UNSIGNED NOT NULL DEFAULT '0',
-  `mapId` SMALLINT(5) UNSIGNED NOT NULL DEFAULT '0',
-  `posX` FLOAT NOT NULL DEFAULT '0',
-  `posY` FLOAT NOT NULL DEFAULT '0',
-  `posZ` FLOAT NOT NULL DEFAULT '0',
-  `facing` FLOAT NOT NULL DEFAULT '0',
-  `targetCharacterGuid` BIGINT(20) UNSIGNED NOT NULL,
-  `complaintType` SMALLINT(5) UNSIGNED NOT NULL,
-  `reportLineIndex` INT(10) NOT NULL,
-  `closedBy` BIGINT(20) NOT NULL DEFAULT '0',
-  `assignedTo` BIGINT(20) UNSIGNED NOT NULL DEFAULT '0' COMMENT 'GUID of admin to whom ticket is assigned',
-  `comment` TEXT NOT NULL,
+  `id` int(10) unsigned NOT NULL,
+  `playerGuid` bigint(20) unsigned NOT NULL,
+  `note` text NOT NULL,
+  `createTime` int(10) unsigned NOT NULL DEFAULT '0',
+  `mapId` smallint(5) unsigned NOT NULL DEFAULT '0',
+  `posX` float NOT NULL DEFAULT '0',
+  `posY` float NOT NULL DEFAULT '0',
+  `posZ` float NOT NULL DEFAULT '0',
+  `facing` float NOT NULL DEFAULT '0',
+  `targetCharacterGuid` bigint(20) unsigned NOT NULL,
+  `complaintType` smallint(5) unsigned NOT NULL,
+  `reportLineIndex` int(10) NOT NULL,
+  `closedBy` bigint(20) NOT NULL DEFAULT '0',
+  `assignedTo` bigint(20) unsigned NOT NULL DEFAULT '0' COMMENT 'GUID of admin to whom ticket is assigned',
+  `comment` text NOT NULL,
   PRIMARY KEY (`id`)
-) COLLATE='utf8_general_ci' ENGINE=InnoDB;
+) ENGINE=InnoDB DEFAULT CHARSET=utf8;
 /*!40101 SET character_set_client = @saved_cs_client */;
 
 --
@@ -1695,12 +1695,12 @@ DROP TABLE IF EXISTS `gm_complaint_chatlog`;
 /*!40101 SET @saved_cs_client     = @@character_set_client */;
 /*!40101 SET character_set_client = utf8 */;
 CREATE TABLE `gm_complaint_chatlog` (
-  `complaintId` INT(10) UNSIGNED NOT NULL,
-  `lineId` INT(10) UNSIGNED NOT NULL,
-  `timestamp` INT(10) UNSIGNED NOT NULL,
-  `text` TEXT NOT NULL,
-  PRIMARY KEY (`complaintId`, `lineId`)
-) COLLATE='utf8_general_ci' ENGINE=InnoDB;
+  `complaintId` int(10) unsigned NOT NULL,
+  `lineId` int(10) unsigned NOT NULL,
+  `timestamp` int(10) unsigned NOT NULL,
+  `text` text NOT NULL,
+  PRIMARY KEY (`complaintId`,`lineId`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8;
 /*!40101 SET character_set_client = @saved_cs_client */;
 
 --
@@ -1720,12 +1720,12 @@ DROP TABLE IF EXISTS `gm_subsurvey`;
 /*!40101 SET @saved_cs_client     = @@character_set_client */;
 /*!40101 SET character_set_client = utf8 */;
 CREATE TABLE `gm_subsurvey` (
-  `surveyId` INT(10) UNSIGNED NOT NULL AUTO_INCREMENT,
-  `questionId` INT(10) UNSIGNED NOT NULL DEFAULT '0',
-  `answer` INT(10) UNSIGNED NOT NULL DEFAULT '0',
-  `answerComment` TEXT NOT NULL,
-  PRIMARY KEY (`surveyId`, `questionId`)
-) COMMENT='Player System' COLLATE='utf8_general_ci' ENGINE=InnoDB;
+  `surveyId` int(10) unsigned NOT NULL AUTO_INCREMENT,
+  `questionId` int(10) unsigned NOT NULL DEFAULT '0',
+  `answer` int(10) unsigned NOT NULL DEFAULT '0',
+  `answerComment` text NOT NULL,
+  PRIMARY KEY (`surveyId`,`questionId`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8 COMMENT='Player System';
 /*!40101 SET character_set_client = @saved_cs_client */;
 
 --
@@ -1740,24 +1740,25 @@ UNLOCK TABLES;
 --
 -- Table structure for table `gm_suggestion`
 --
+
 DROP TABLE IF EXISTS `gm_suggestion`;
 /*!40101 SET @saved_cs_client     = @@character_set_client */;
 /*!40101 SET character_set_client = utf8 */;
 CREATE TABLE `gm_suggestion` (
-  `id` INT(10) UNSIGNED NOT NULL,
-  `playerGuid` BIGINT(20) UNSIGNED NOT NULL,
-  `note` TEXT NOT NULL,
-  `createTime` INT(10) UNSIGNED NOT NULL DEFAULT '0',
-  `mapId` SMALLINT(5) UNSIGNED NOT NULL DEFAULT '0',
-  `posX` FLOAT NOT NULL DEFAULT '0',
-  `posY` FLOAT NOT NULL DEFAULT '0',
-  `posZ` FLOAT NOT NULL DEFAULT '0',
-  `facing` FLOAT NOT NULL DEFAULT '0',
-  `closedBy` BIGINT(20) NOT NULL DEFAULT '0',
-  `assignedTo` BIGINT(20) UNSIGNED NOT NULL DEFAULT '0' COMMENT 'GUID of admin to whom ticket is assigned',
-  `comment` TEXT NOT NULL,
+  `id` int(10) unsigned NOT NULL,
+  `playerGuid` bigint(20) unsigned NOT NULL,
+  `note` text NOT NULL,
+  `createTime` int(10) unsigned NOT NULL DEFAULT '0',
+  `mapId` smallint(5) unsigned NOT NULL DEFAULT '0',
+  `posX` float NOT NULL DEFAULT '0',
+  `posY` float NOT NULL DEFAULT '0',
+  `posZ` float NOT NULL DEFAULT '0',
+  `facing` float NOT NULL DEFAULT '0',
+  `closedBy` bigint(20) NOT NULL DEFAULT '0',
+  `assignedTo` bigint(20) unsigned NOT NULL DEFAULT '0' COMMENT 'GUID of admin to whom ticket is assigned',
+  `comment` text NOT NULL,
   PRIMARY KEY (`id`)
-) COLLATE='utf8_general_ci' ENGINE=InnoDB;
+) ENGINE=InnoDB DEFAULT CHARSET=utf8;
 /*!40101 SET character_set_client = @saved_cs_client */;
 
 --
@@ -1777,13 +1778,13 @@ DROP TABLE IF EXISTS `gm_survey`;
 /*!40101 SET @saved_cs_client     = @@character_set_client */;
 /*!40101 SET character_set_client = utf8 */;
 CREATE TABLE `gm_survey` (
-  `surveyId` INT(10) UNSIGNED NOT NULL AUTO_INCREMENT,
-  `guid` BIGINT(20) UNSIGNED NOT NULL DEFAULT '0',
-  `mainSurvey` INT(10) UNSIGNED NOT NULL DEFAULT '0',
-  `comment` LONGTEXT NOT NULL,
-  `createTime` INT(10) UNSIGNED NOT NULL DEFAULT '0',
+  `surveyId` int(10) unsigned NOT NULL AUTO_INCREMENT,
+  `guid` bigint(20) unsigned NOT NULL DEFAULT '0',
+  `mainSurvey` int(10) unsigned NOT NULL DEFAULT '0',
+  `comment` longtext NOT NULL,
+  `createTime` int(10) unsigned NOT NULL DEFAULT '0',
   PRIMARY KEY (`surveyId`)
-) COMMENT='Player System' COLLATE='utf8_general_ci' ENGINE=InnoDB;
+) ENGINE=InnoDB DEFAULT CHARSET=utf8 COMMENT='Player System';
 /*!40101 SET character_set_client = @saved_cs_client */;
 
 --
@@ -1803,25 +1804,25 @@ DROP TABLE IF EXISTS `gm_ticket`;
 /*!40101 SET @saved_cs_client     = @@character_set_client */;
 /*!40101 SET character_set_client = utf8 */;
 CREATE TABLE `gm_ticket` (
-  `id` INT(10) UNSIGNED NOT NULL AUTO_INCREMENT,
-  `playerGuid` BIGINT(20) UNSIGNED NOT NULL DEFAULT '0' COMMENT 'Global Unique Identifier of ticket creator',
-  `description` TEXT NOT NULL,
-  `createTime` INT(10) UNSIGNED NOT NULL DEFAULT '0',
-  `mapId` SMALLINT(5) UNSIGNED NOT NULL DEFAULT '0',
-  `posX` FLOAT NOT NULL DEFAULT '0',
-  `posY` FLOAT NOT NULL DEFAULT '0',
-  `posZ` FLOAT NOT NULL DEFAULT '0',
-  `lastModifiedTime` INT(10) UNSIGNED NOT NULL DEFAULT '0',
-  `closedBy` BIGINT(20) NOT NULL DEFAULT '0',
-  `assignedTo` BIGINT(20) UNSIGNED NOT NULL DEFAULT '0',
-  `comment` TEXT NOT NULL,
-  `response` TEXT NOT NULL,
-  `completed` TINYINT(3) UNSIGNED NOT NULL DEFAULT '0',
-  `escalated` TINYINT(3) UNSIGNED NOT NULL DEFAULT '0',
-  `viewed` TINYINT(3) UNSIGNED NOT NULL DEFAULT '0',
-  `needMoreHelp` TINYINT(3) UNSIGNED NOT NULL DEFAULT '0',
+  `id` int(10) unsigned NOT NULL AUTO_INCREMENT,
+  `playerGuid` bigint(20) unsigned NOT NULL DEFAULT '0' COMMENT 'Global Unique Identifier of ticket creator',
+  `description` text NOT NULL,
+  `createTime` int(10) unsigned NOT NULL DEFAULT '0',
+  `mapId` smallint(5) unsigned NOT NULL DEFAULT '0',
+  `posX` float NOT NULL DEFAULT '0',
+  `posY` float NOT NULL DEFAULT '0',
+  `posZ` float NOT NULL DEFAULT '0',
+  `lastModifiedTime` int(10) unsigned NOT NULL DEFAULT '0',
+  `closedBy` bigint(20) NOT NULL DEFAULT '0',
+  `assignedTo` bigint(20) unsigned NOT NULL DEFAULT '0',
+  `comment` text NOT NULL,
+  `response` text NOT NULL,
+  `completed` tinyint(3) unsigned NOT NULL DEFAULT '0',
+  `escalated` tinyint(3) unsigned NOT NULL DEFAULT '0',
+  `viewed` tinyint(3) unsigned NOT NULL DEFAULT '0',
+  `needMoreHelp` tinyint(3) unsigned NOT NULL DEFAULT '0',
   PRIMARY KEY (`id`)
-) COMMENT='Player System' COLLATE='utf8_general_ci' ENGINE=InnoDB;
+) ENGINE=InnoDB DEFAULT CHARSET=utf8 COMMENT='Player System';
 /*!40101 SET character_set_client = @saved_cs_client */;
 
 --
@@ -2379,6 +2380,7 @@ CREATE TABLE `instance_reset` (
 
 LOCK TABLES `instance_reset` WRITE;
 /*!40000 ALTER TABLE `instance_reset` DISABLE KEYS */;
+INSERT INTO `instance_reset` VALUES (33,2,1426996800),(36,2,1426996800),(249,3,1427515200),(249,4,1427515200),(269,2,1426996800),(409,9,1427515200),(469,9,1427515200),(509,3,1427169600),(531,9,1427515200),(532,3,1427515200),(533,3,1427515200),(533,4,1427515200),(534,4,1427515200),(540,2,1426996800),(542,2,1426996800),(543,2,1426996800),(544,4,1427515200),(545,2,1426996800),(546,2,1426996800),(547,2,1426996800),(548,4,1427515200),(550,4,1427515200),(552,2,1426996800),(553,2,1426996800),(554,2,1426996800),(555,2,1426996800),(556,2,1426996800),(557,2,1426996800),(558,2,1426996800),(560,2,1426996800),(564,4,1427515200),(565,4,1427515200),(568,2,1426996800),(574,2,1426996800),(575,2,1426996800),(576,2,1426996800),(578,2,1426996800),(580,4,1427515200),(585,2,1426996800),(595,2,1426996800),(598,2,1426996800),(599,2,1426996800),(600,2,1426996800),(601,2,1426996800),(602,2,1426996800),(603,3,1427515200),(603,4,1427515200),(604,2,1426996800),(608,2,1426996800),(615,3,1427515200),(615,4,1427515200),(616,3,1427515200),(616,4,1427515200),(619,2,1426996800),(624,3,1427515200),(624,4,1427515200),(631,3,1427515200),(631,4,1427515200),(631,5,1427515200),(631,6,1427515200),(632,2,1426996800),(643,2,1426996800),(644,2,1426996800),(645,2,1426996800),(649,3,1427515200),(649,4,1427515200),(649,5,1427515200),(649,6,1427515200),(650,2,1426996800),(657,2,1426996800),(658,2,1426996800),(668,2,1426996800),(669,3,1427515200),(669,4,1427515200),(669,5,1427515200),(669,6,1427515200),(670,2,1426996800),(671,3,1427515200),(671,4,1427515200),(671,5,1427515200),(671,6,1427515200),(720,3,1427515200),(720,4,1427515200),(720,5,1427515200),(720,6,1427515200),(724,3,1427515200),(724,4,1427515200),(724,5,1427515200),(724,6,1427515200),(725,2,1426996800),(754,3,1427515200),(754,4,1427515200),(754,5,1427515200),(754,6,1427515200),(755,2,1426996800),(757,3,1427515200),(757,4,1427515200),(757,5,1427515200),(757,6,1427515200),(859,2,1426996800),(938,2,1426996800),(939,2,1426996800),(940,2,1426996800),(959,2,1426996800),(960,2,1426996800),(961,2,1426996800),(962,2,1426996800),(967,3,1427515200),(967,4,1427515200),(967,5,1427515200),(967,6,1427515200),(994,2,1426996800),(996,3,1427515200),(996,4,1427515200),(996,5,1427515200),(996,6,1427515200),(1001,2,1426996800),(1004,2,1426996800),(1007,2,1426996800),(1008,3,1427515200),(1008,4,1427515200),(1008,5,1427515200),(1008,6,1427515200),(1009,3,1427515200),(1009,4,1427515200),(1009,5,1427515200),(1009,6,1427515200),(1011,2,1426996800),(1098,3,1427515200),(1098,4,1427515200),(1098,5,1427515200),(1098,6,1427515200),(1136,14,1427515200),(1136,15,1427515200),(1136,16,1427515200),(1175,2,1426996800),(1176,2,1426996800),(1182,2,1426996800),(1195,2,1426996800),(1205,14,1427515200),(1205,15,1427515200),(1205,16,1427515200),(1208,2,1426996800),(1209,2,1426996800),(1228,14,1427515200),(1228,15,1427515200),(1228,16,1427515200),(1279,2,1426996800),(1358,2,1426996800);
 /*!40000 ALTER TABLE `instance_reset` ENABLE KEYS */;
 UNLOCK TABLES;
 
@@ -2929,6 +2931,57 @@ LOCK TABLES `reserved_name` WRITE;
 UNLOCK TABLES;
 
 --
+-- Table structure for table `updates`
+--
+
+DROP TABLE IF EXISTS `updates`;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `updates` (
+  `name` varchar(200) NOT NULL COMMENT 'filename with extension of the update.',
+  `hash` char(40) DEFAULT '' COMMENT 'sha1 hash of the sql file.',
+  `state` enum('RELEASED','ARCHIVED') NOT NULL DEFAULT 'RELEASED' COMMENT 'defines if an update is released or archived.',
+  `timestamp` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT 'timestamp when the query was applied.',
+  `speed` int(10) unsigned NOT NULL DEFAULT '0' COMMENT 'time the query takes to apply in ms.',
+  PRIMARY KEY (`name`)
+) ENGINE=MyISAM DEFAULT CHARSET=utf8 COMMENT='List of all applied updates in this database.';
+/*!40101 SET character_set_client = @saved_cs_client */;
+
+--
+-- Dumping data for table `updates`
+--
+
+LOCK TABLES `updates` WRITE;
+/*!40000 ALTER TABLE `updates` DISABLE KEYS */;
+INSERT INTO `updates` VALUES ('2014_10_20_00_characters.sql','A5882DA0979CF4DAE33DA011EBAA006C24BE7230','ARCHIVED','2015-03-21 16:55:55',0),('2014_10_23_00_characters.sql','E2AC4758133EE19B7F08464A445802154D1261C8','ARCHIVED','2015-03-21 16:55:55',0),('2014_10_23_01_characters.sql','20029E6323D9773B32C34D84FFED1711CC60F09F','ARCHIVED','2015-03-21 16:55:55',0),('2014_10_23_02_characters.sql','8A7A16886EE71E7ACDDB3DDA6D0ECAC2FD2FDCA8','ARCHIVED','2015-03-21 16:55:55',0),('2014_10_24_00_characters.sql','D008FE81AE844FCA686439D6ECC5108FB0DD1EB9','ARCHIVED','2015-03-21 16:55:55',0),('2014_10_25_00_characters.sql','A39C7BE46686B54776BDAB9D7A882D91EDEC51A4','ARCHIVED','2015-03-21 16:55:55',0),('2014_10_26_00_characters.sql','C787954CC35FE34B4101FDE6527F14C027F4947C','ARCHIVED','2015-03-21 16:55:55',0),('2014_11_12_00_characters.sql','B160BB2313F1BD5F3B076A5A9279DC10D4796E34','ARCHIVED','2015-03-21 16:55:55',0),('2014_12_23_00_characters.sql','3D9D648B2387B357F4BD090B33F80682F7924882','ARCHIVED','2015-03-21 16:55:55',0),('2014_12_28_00_characters.sql','5362922FF4483A336311D73082A5727309CD9219','ARCHIVED','2015-03-21 16:55:55',0),('2014_12_31_00_characters.sql','498DDF2DD936CF156D74A8208DC93DCE9FCAB5AA','ARCHIVED','2015-03-21 16:55:55',0),('2015_01_02_00_characters.sql','E5940BE836F253982E07930120422E598D08BDE1','ARCHIVED','2015-03-21 16:55:55',0),('2015_01_10_00_characters.sql','30796056C8623699B2FE1BF626A19D38262E9284','ARCHIVED','2015-03-21 16:55:55',0),('2015_01_16_00_characters.sql','96642760A54C8D799AAFE438049A63AA521656F2','ARCHIVED','2015-03-21 16:55:55',0),('2015_01_27_00_characters.sql','EB710E3EB9F2CAFD84AB62CDC84E898403A80A4F','ARCHIVED','2015-03-21 16:55:55',0),('2015_02_13_00_characters.sql','405BEB4ED207DC6076442A37EE2AFB1F21E274A0','ARCHIVED','2015-03-21 16:55:55',0),('2015_02_13_01_characters.sql','35F582D4F33BF55D1685A1BA89273ED895FD09C5','ARCHIVED','2015-03-21 16:55:55',0),('2015_02_17_00_characters.sql','8D21FC5A55BF8B55D6DCDCE5F02CF2B640230E94','ARCHIVED','2015-03-21 16:55:55',0),('2015_03_10_00_characters.sql','E565B89B145C340067742DFF2DEF1B74F5F1BD4E','ARCHIVED','2015-03-21 16:55:55',0),('2015_03_20_00_characters.sql','B761760804EA73BD297F296C5C1919687DF7191C','ARCHIVED','2015-03-21 16:55:55',0),('2015_03_20_01_characters.sql','20BD68468C57FCF7E665B4DA185DCD52FACE8B3F','ARCHIVED','2015-03-21 16:55:55',0),('2015_03_20_02_characters.sql','0296995DCD3676BA9AE6024CA7C91C5F39D927A3','ARCHIVED','2015-03-21 16:56:46',0);
+/*!40000 ALTER TABLE `updates` ENABLE KEYS */;
+UNLOCK TABLES;
+
+--
+-- Table structure for table `updates_include`
+--
+
+DROP TABLE IF EXISTS `updates_include`;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `updates_include` (
+  `path` varchar(200) NOT NULL COMMENT 'directory to include. $ means relative to the source directory.',
+  `state` enum('RELEASED','ARCHIVED') NOT NULL DEFAULT 'RELEASED' COMMENT 'defines if the directory contains released or archived updates.',
+  PRIMARY KEY (`path`)
+) ENGINE=MyISAM DEFAULT CHARSET=utf8 COMMENT='List of directories where we want to include sql updates.';
+/*!40101 SET character_set_client = @saved_cs_client */;
+
+--
+-- Dumping data for table `updates_include`
+--
+
+LOCK TABLES `updates_include` WRITE;
+/*!40000 ALTER TABLE `updates_include` DISABLE KEYS */;
+INSERT INTO `updates_include` VALUES ('$/sql/updates/characters','RELEASED'),('$/sql/custom/characters','RELEASED'),('$/sql/old/6.x/characters','ARCHIVED');
+/*!40000 ALTER TABLE `updates_include` ENABLE KEYS */;
+UNLOCK TABLES;
+
+--
 -- Table structure for table `warden_action`
 --
 
@@ -2985,59 +3038,4 @@ UNLOCK TABLES;
 /*!40101 SET COLLATION_CONNECTION=@OLD_COLLATION_CONNECTION */;
 /*!40111 SET SQL_NOTES=@OLD_SQL_NOTES */;
 
--- Dump completed on 2015-01-27 22:41:44
-
--- Updates base tables
-DROP TABLE IF EXISTS `updates`;
-CREATE TABLE `updates` (
-    `name` VARCHAR(200) NOT NULL COMMENT 'filename with extension of the update.',
-    `hash` CHAR(40) NULL DEFAULT '' COMMENT 'sha1 hash of the sql file.',
-    `state` ENUM('RELEASED','ARCHIVED') NOT NULL DEFAULT 'RELEASED' COMMENT 'defines if an update is released or archived.',
-    `timestamp` TIMESTAMP NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT 'timestamp when the query was applied.',
-    `speed` INT(10) UNSIGNED NOT NULL DEFAULT 0 COMMENT 'time the query takes to apply in ms.',
-    PRIMARY KEY (`name`)
-)
-COMMENT='List of all applied updates in this database.'
-COLLATE='utf8_general_ci'
-ENGINE=MyISAM;
-
-DROP TABLE IF EXISTS `updates_include`;
-CREATE TABLE `updates_include` (
-    `path` VARCHAR(200) NOT NULL COMMENT 'directory to include. $ means relative to the source directory.',
-    `state` ENUM('RELEASED','ARCHIVED') NOT NULL DEFAULT 'RELEASED' COMMENT 'defines if the directory contains released or archived updates.',
-    PRIMARY KEY (`path`)
-)
-COMMENT='List of directories where we want to include sql updates.'
-COLLATE='utf8_general_ci'
-ENGINE=MyISAM;
-
--- Characters database update data
-TRUNCATE TABLE `updates_include`;
-INSERT INTO `updates_include` (`path`, `state`) VALUES
-('$/sql/updates/characters', 'RELEASED'),
-('$/sql/custom/characters', 'RELEASED'),
-('$/sql/old/6.x/characters', 'ARCHIVED');
-
-INSERT IGNORE INTO `updates` (`name`, `hash`) VALUES
-('2014_10_20_00_characters.sql', 'A5882DA0979CF4DAE33DA011EBAA006C24BE7230'),
-('2014_10_23_00_characters.sql', 'E2AC4758133EE19B7F08464A445802154D1261C8'),
-('2014_10_23_01_characters.sql', '20029E6323D9773B32C34D84FFED1711CC60F09F'),
-('2014_10_23_02_characters.sql', '8A7A16886EE71E7ACDDB3DDA6D0ECAC2FD2FDCA8'),
-('2014_10_24_00_characters.sql', 'D008FE81AE844FCA686439D6ECC5108FB0DD1EB9'),
-('2014_10_25_00_characters.sql', 'A39C7BE46686B54776BDAB9D7A882D91EDEC51A4'),
-('2014_10_26_00_characters.sql', 'C787954CC35FE34B4101FDE6527F14C027F4947C'),
-('2014_11_12_00_characters.sql', 'B160BB2313F1BD5F3B076A5A9279DC10D4796E34'),
-('2014_12_23_00_characters.sql', '3D9D648B2387B357F4BD090B33F80682F7924882'),
-('2014_12_28_00_characters.sql', '5362922FF4483A336311D73082A5727309CD9219'),
-('2014_12_31_00_characters.sql', '498DDF2DD936CF156D74A8208DC93DCE9FCAB5AA'),
-('2015_01_02_00_characters.sql', 'E5940BE836F253982E07930120422E598D08BDE1'),
-('2015_01_10_00_characters.sql', '30796056C8623699B2FE1BF626A19D38262E9284'),
-('2015_01_16_00_characters.sql', '96642760A54C8D799AAFE438049A63AA521656F2'),
-('2015_01_27_00_characters.sql', 'EB710E3EB9F2CAFD84AB62CDC84E898403A80A4F'),
-('2015_02_13_00_characters.sql', '405BEB4ED207DC6076442A37EE2AFB1F21E274A0'),
-('2015_02_13_01_characters.sql', '35F582D4F33BF55D1685A1BA89273ED895FD09C5'),
-('2015_02_17_00_characters.sql', '8D21FC5A55BF8B55D6DCDCE5F02CF2B640230E94'),
-('2015_03_10_00_characters.sql', 'E565B89B145C340067742DFF2DEF1B74F5F1BD4E'),
-('2015_03_20_00_characters.sql', 'B761760804EA73BD297F296C5C1919687DF7191C'),
-('2015_03_20_01_characters.sql', '20BD68468C57FCF7E665B4DA185DCD52FACE8B3F'),
-('2015_03_20_02_characters.sql', '');
+-- Dump completed on 2015-03-21 17:03:16
diff --git a/sql/base/dev/hotfixes_database.sql b/sql/base/dev/hotfixes_database.sql
new file mode 100644
index 00000000000..1dcaf45bdab
--- /dev/null
+++ b/sql/base/dev/hotfixes_database.sql
@@ -0,0 +1,1274 @@
+-- MySQL dump 10.13  Distrib 5.6.9-rc, for Win64 (x86_64)
+--
+-- Host: localhost    Database: hotfixes
+-- ------------------------------------------------------
+-- Server version	5.6.9-rc
+
+/*!40101 SET @OLD_CHARACTER_SET_CLIENT=@@CHARACTER_SET_CLIENT */;
+/*!40101 SET @OLD_CHARACTER_SET_RESULTS=@@CHARACTER_SET_RESULTS */;
+/*!40101 SET @OLD_COLLATION_CONNECTION=@@COLLATION_CONNECTION */;
+/*!40101 SET NAMES utf8 */;
+/*!40103 SET @OLD_TIME_ZONE=@@TIME_ZONE */;
+/*!40103 SET TIME_ZONE='+00:00' */;
+/*!40014 SET @OLD_UNIQUE_CHECKS=@@UNIQUE_CHECKS, UNIQUE_CHECKS=0 */;
+/*!40014 SET @OLD_FOREIGN_KEY_CHECKS=@@FOREIGN_KEY_CHECKS, FOREIGN_KEY_CHECKS=0 */;
+/*!40101 SET @OLD_SQL_MODE=@@SQL_MODE, SQL_MODE='NO_AUTO_VALUE_ON_ZERO' */;
+/*!40111 SET @OLD_SQL_NOTES=@@SQL_NOTES, SQL_NOTES=0 */;
+
+--
+-- Table structure for table `area_group`
+--
+
+DROP TABLE IF EXISTS `area_group`;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `area_group` (
+  `ID` int(10) unsigned NOT NULL DEFAULT '0',
+  `VerifiedBuild` smallint(6) NOT NULL DEFAULT '0',
+  PRIMARY KEY (`ID`)
+) ENGINE=MyISAM DEFAULT CHARSET=utf8;
+/*!40101 SET character_set_client = @saved_cs_client */;
+
+--
+-- Table structure for table `area_group_member`
+--
+
+DROP TABLE IF EXISTS `area_group_member`;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `area_group_member` (
+  `ID` int(10) unsigned NOT NULL DEFAULT '0',
+  `AreaGroupID` int(10) unsigned NOT NULL DEFAULT '0',
+  `AreaID` int(10) unsigned NOT NULL DEFAULT '0',
+  `VerifiedBuild` smallint(6) NOT NULL DEFAULT '0',
+  PRIMARY KEY (`ID`)
+) ENGINE=MyISAM DEFAULT CHARSET=utf8;
+/*!40101 SET character_set_client = @saved_cs_client */;
+
+--
+-- Table structure for table `area_poi`
+--
+
+DROP TABLE IF EXISTS `area_poi`;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `area_poi` (
+  `ID` mediumint(8) unsigned NOT NULL DEFAULT '0',
+  `Flags` mediumint(8) NOT NULL DEFAULT '0',
+  `Importance` mediumint(8) unsigned NOT NULL DEFAULT '0',
+  `FactionID` mediumint(8) unsigned NOT NULL DEFAULT '0',
+  `MapID` mediumint(8) unsigned NOT NULL DEFAULT '0',
+  `AreaID` mediumint(8) unsigned NOT NULL DEFAULT '0',
+  `Icon` mediumint(8) unsigned NOT NULL DEFAULT '0',
+  `PositionX` float NOT NULL DEFAULT '0',
+  `PositionY` float NOT NULL DEFAULT '0',
+  `Name` text NOT NULL,
+  `Description` text NOT NULL,
+  `WorldStateID` mediumint(8) unsigned NOT NULL DEFAULT '0',
+  `PlayerConditionID` mediumint(8) unsigned NOT NULL DEFAULT '0',
+  `WorldMapLink` mediumint(8) unsigned NOT NULL DEFAULT '0',
+  `PortLocID` mediumint(8) unsigned NOT NULL DEFAULT '0',
+  `VerifiedBuild` smallint(5) NOT NULL DEFAULT '0',
+  PRIMARY KEY (`ID`)
+) ENGINE=MyISAM DEFAULT CHARSET=utf8;
+/*!40101 SET character_set_client = @saved_cs_client */;
+
+--
+-- Table structure for table `area_poi_state`
+--
+
+DROP TABLE IF EXISTS `area_poi_state`;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `area_poi_state` (
+  `ID` mediumint(8) unsigned NOT NULL DEFAULT '0',
+  `AreaPOIID` mediumint(8) unsigned NOT NULL DEFAULT '0',
+  `State` mediumint(8) unsigned NOT NULL DEFAULT '0',
+  `Icon` mediumint(8) unsigned NOT NULL DEFAULT '0',
+  `Description` text NOT NULL,
+  `VerifiedBuild` smallint(5) NOT NULL DEFAULT '0',
+  PRIMARY KEY (`ID`)
+) ENGINE=MyISAM DEFAULT CHARSET=utf8;
+/*!40101 SET character_set_client = @saved_cs_client */;
+
+--
+-- Table structure for table `broadcast_text`
+--
+
+DROP TABLE IF EXISTS `broadcast_text`;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `broadcast_text` (
+  `ID` int(10) unsigned NOT NULL DEFAULT '0',
+  `Language` int(11) NOT NULL DEFAULT '0',
+  `MaleText` text,
+  `FemaleText` text,
+  `EmoteID1` int(10) unsigned NOT NULL DEFAULT '0',
+  `EmoteID2` int(10) unsigned NOT NULL DEFAULT '0',
+  `EmoteID3` int(10) unsigned NOT NULL DEFAULT '0',
+  `EmoteDelay1` int(10) unsigned NOT NULL DEFAULT '0',
+  `EmoteDelay2` int(10) unsigned NOT NULL DEFAULT '0',
+  `EmoteDelay3` int(10) unsigned NOT NULL DEFAULT '0',
+  `SoundID` int(10) unsigned NOT NULL DEFAULT '0',
+  `UnkEmoteID` int(10) unsigned NOT NULL DEFAULT '0',
+  `Type` int(10) unsigned NOT NULL DEFAULT '0',
+  `VerifiedBuild` smallint(5) NOT NULL DEFAULT '0',
+  PRIMARY KEY (`ID`)
+) ENGINE=MyISAM DEFAULT CHARSET=utf8;
+/*!40101 SET character_set_client = @saved_cs_client */;
+
+--
+-- Table structure for table `broadcast_text_locale`
+--
+
+DROP TABLE IF EXISTS `broadcast_text_locale`;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `broadcast_text_locale` (
+  `ID` int(10) unsigned NOT NULL DEFAULT '0',
+  `locale` varchar(4) NOT NULL,
+  `MaleText_lang` text,
+  `FemaleText_lang` text,
+  `VerifiedBuild` smallint(6) NOT NULL DEFAULT '0',
+  PRIMARY KEY (`ID`,`locale`)
+) ENGINE=MyISAM DEFAULT CHARSET=utf8;
+/*!40101 SET character_set_client = @saved_cs_client */;
+
+--
+-- Table structure for table `creature`
+--
+
+DROP TABLE IF EXISTS `creature`;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `creature` (
+  `ID` mediumint(8) unsigned NOT NULL DEFAULT '0',
+  `Type` mediumint(8) unsigned NOT NULL DEFAULT '0',
+  `ItemID1` mediumint(8) unsigned NOT NULL DEFAULT '0',
+  `ItemID2` mediumint(8) unsigned NOT NULL DEFAULT '0',
+  `ItemID3` mediumint(8) unsigned NOT NULL DEFAULT '0',
+  `Mount` mediumint(8) unsigned NOT NULL DEFAULT '0',
+  `DisplayID1` mediumint(8) unsigned NOT NULL DEFAULT '0',
+  `DisplayID2` mediumint(8) unsigned NOT NULL DEFAULT '0',
+  `DisplayID3` mediumint(8) unsigned NOT NULL DEFAULT '0',
+  `DisplayID4` mediumint(8) unsigned NOT NULL DEFAULT '0',
+  `DisplayIDProbability1` float NOT NULL DEFAULT '0',
+  `DisplayIDProbability2` float NOT NULL DEFAULT '0',
+  `DisplayIDProbability3` float NOT NULL DEFAULT '0',
+  `DisplayIDProbability4` float NOT NULL DEFAULT '0',
+  `Name` text NOT NULL,
+  `FemaleName` text NOT NULL,
+  `SubName` text NOT NULL,
+  `FemaleSubName` text NOT NULL,
+  `Rank` mediumint(8) unsigned NOT NULL DEFAULT '0',
+  `InhabitType` mediumint(8) unsigned NOT NULL DEFAULT '0',
+  `VerifiedBuild` smallint(5) NOT NULL DEFAULT '0',
+  PRIMARY KEY (`ID`)
+) ENGINE=MyISAM DEFAULT CHARSET=utf8;
+/*!40101 SET character_set_client = @saved_cs_client */;
+
+--
+-- Table structure for table `creature_difficulty`
+--
+
+DROP TABLE IF EXISTS `creature_difficulty`;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `creature_difficulty` (
+  `ID` mediumint(8) unsigned NOT NULL DEFAULT '0',
+  `CreatureID` mediumint(8) unsigned NOT NULL DEFAULT '0',
+  `FactionID` mediumint(8) unsigned NOT NULL DEFAULT '0',
+  `Expansion` mediumint(8) NOT NULL DEFAULT '0',
+  `MinLevel` mediumint(8) NOT NULL DEFAULT '0',
+  `MaxLevel` mediumint(8) NOT NULL DEFAULT '0',
+  `Flags1` int(10) unsigned NOT NULL DEFAULT '0',
+  `Flags2` int(10) unsigned NOT NULL DEFAULT '0',
+  `Flags3` int(10) unsigned NOT NULL DEFAULT '0',
+  `Flags4` int(10) unsigned NOT NULL DEFAULT '0',
+  `Flags5` int(10) unsigned NOT NULL DEFAULT '0',
+  `VerifiedBuild` smallint(5) NOT NULL DEFAULT '0',
+  PRIMARY KEY (`ID`)
+) ENGINE=MyISAM DEFAULT CHARSET=utf8;
+/*!40101 SET character_set_client = @saved_cs_client */;
+
+--
+-- Table structure for table `currency_types`
+--
+
+DROP TABLE IF EXISTS `currency_types`;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `currency_types` (
+  `ID` int(10) unsigned NOT NULL DEFAULT '0',
+  `CategoryID` int(10) unsigned NOT NULL DEFAULT '0',
+  `Name` text,
+  `InventoryIcon1` text,
+  `InventoryIcon2` text,
+  `SpellWeight` int(10) unsigned NOT NULL DEFAULT '0',
+  `SpellCategory` int(10) unsigned NOT NULL DEFAULT '0',
+  `MaxQty` int(10) unsigned NOT NULL DEFAULT '0',
+  `MaxEarnablePerWeek` int(10) unsigned NOT NULL DEFAULT '0',
+  `Flags` int(10) unsigned NOT NULL DEFAULT '0',
+  `Quality` int(10) unsigned NOT NULL DEFAULT '0',
+  `Description` text,
+  `VerifiedBuild` smallint(6) NOT NULL DEFAULT '0',
+  PRIMARY KEY (`ID`)
+) ENGINE=MyISAM DEFAULT CHARSET=utf8;
+/*!40101 SET character_set_client = @saved_cs_client */;
+
+--
+-- Table structure for table `currency_types_locale`
+--
+
+DROP TABLE IF EXISTS `currency_types_locale`;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `currency_types_locale` (
+  `ID` int(10) unsigned NOT NULL DEFAULT '0',
+  `locale` varchar(4) NOT NULL,
+  `Name_lang` text,
+  `InventoryIcon1_lang` text,
+  `InventoryIcon2_lang` text,
+  `Description_lang` text,
+  `VerifiedBuild` smallint(6) NOT NULL DEFAULT '0',
+  PRIMARY KEY (`ID`,`locale`)
+) ENGINE=MyISAM DEFAULT CHARSET=utf8;
+/*!40101 SET character_set_client = @saved_cs_client */;
+
+--
+-- Table structure for table `curve_point`
+--
+
+DROP TABLE IF EXISTS `curve_point`;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `curve_point` (
+  `ID` int(10) unsigned NOT NULL DEFAULT '0',
+  `CurveID` int(10) unsigned NOT NULL DEFAULT '0',
+  `Index` int(10) unsigned NOT NULL DEFAULT '0',
+  `X` float NOT NULL DEFAULT '0',
+  `Y` float NOT NULL DEFAULT '0',
+  `VerifiedBuild` smallint(6) NOT NULL DEFAULT '0',
+  PRIMARY KEY (`ID`)
+) ENGINE=MyISAM DEFAULT CHARSET=utf8;
+/*!40101 SET character_set_client = @saved_cs_client */;
+
+--
+-- Table structure for table `gameobjects`
+--
+
+DROP TABLE IF EXISTS `gameobjects`;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `gameobjects` (
+  `ID` mediumint(8) unsigned NOT NULL DEFAULT '0',
+  `MapID` mediumint(8) unsigned NOT NULL DEFAULT '0',
+  `DisplayID` mediumint(8) unsigned NOT NULL DEFAULT '0',
+  `PositionX` float NOT NULL DEFAULT '0',
+  `PositionY` float NOT NULL DEFAULT '0',
+  `PositionZ` float NOT NULL DEFAULT '0',
+  `RotationX` float NOT NULL DEFAULT '0',
+  `RotationY` float NOT NULL DEFAULT '0',
+  `RotationZ` float NOT NULL DEFAULT '0',
+  `RotationW` float NOT NULL DEFAULT '0',
+  `Size` float NOT NULL DEFAULT '0',
+  `PhaseUseFlags` mediumint(8) unsigned NOT NULL DEFAULT '0',
+  `PhaseID` mediumint(8) unsigned NOT NULL DEFAULT '0',
+  `PhaseGroupID` mediumint(8) unsigned NOT NULL DEFAULT '0',
+  `Type` mediumint(8) unsigned NOT NULL DEFAULT '0',
+  `Data0` int(10) unsigned NOT NULL DEFAULT '0',
+  `Data1` int(10) unsigned NOT NULL DEFAULT '0',
+  `Data2` int(10) unsigned NOT NULL DEFAULT '0',
+  `Data3` int(10) unsigned NOT NULL DEFAULT '0',
+  `Data4` int(10) unsigned NOT NULL DEFAULT '0',
+  `Data5` int(10) unsigned NOT NULL DEFAULT '0',
+  `Data6` int(10) unsigned NOT NULL DEFAULT '0',
+  `Data7` int(10) unsigned NOT NULL DEFAULT '0',
+  `Name` text NOT NULL,
+  `VerifiedBuild` smallint(5) NOT NULL DEFAULT '0',
+  PRIMARY KEY (`ID`)
+) ENGINE=MyISAM DEFAULT CHARSET=utf8;
+/*!40101 SET character_set_client = @saved_cs_client */;
+
+--
+-- Table structure for table `holidays`
+--
+
+DROP TABLE IF EXISTS `holidays`;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `holidays` (
+  `ID` int(10) unsigned NOT NULL DEFAULT '0',
+  `Duration1` int(10) unsigned NOT NULL DEFAULT '0',
+  `Duration2` int(10) unsigned NOT NULL DEFAULT '0',
+  `Duration3` int(10) unsigned NOT NULL DEFAULT '0',
+  `Duration4` int(10) unsigned NOT NULL DEFAULT '0',
+  `Duration5` int(10) unsigned NOT NULL DEFAULT '0',
+  `Duration6` int(10) unsigned NOT NULL DEFAULT '0',
+  `Duration7` int(10) unsigned NOT NULL DEFAULT '0',
+  `Duration8` int(10) unsigned NOT NULL DEFAULT '0',
+  `Duration9` int(10) unsigned NOT NULL DEFAULT '0',
+  `Duration10` int(10) unsigned NOT NULL DEFAULT '0',
+  `Date1` int(10) unsigned NOT NULL DEFAULT '0',
+  `Date2` int(10) unsigned NOT NULL DEFAULT '0',
+  `Date3` int(10) unsigned NOT NULL DEFAULT '0',
+  `Date4` int(10) unsigned NOT NULL DEFAULT '0',
+  `Date5` int(10) unsigned NOT NULL DEFAULT '0',
+  `Date6` int(10) unsigned NOT NULL DEFAULT '0',
+  `Date7` int(10) unsigned NOT NULL DEFAULT '0',
+  `Date8` int(10) unsigned NOT NULL DEFAULT '0',
+  `Date9` int(10) unsigned NOT NULL DEFAULT '0',
+  `Date10` int(10) unsigned NOT NULL DEFAULT '0',
+  `Date11` int(10) unsigned NOT NULL DEFAULT '0',
+  `Date12` int(10) unsigned NOT NULL DEFAULT '0',
+  `Date13` int(10) unsigned NOT NULL DEFAULT '0',
+  `Date14` int(10) unsigned NOT NULL DEFAULT '0',
+  `Date15` int(10) unsigned NOT NULL DEFAULT '0',
+  `Date16` int(10) unsigned NOT NULL DEFAULT '0',
+  `Region` int(10) unsigned NOT NULL DEFAULT '0',
+  `Looping` int(10) unsigned NOT NULL DEFAULT '0',
+  `CalendarFlags1` int(10) unsigned NOT NULL DEFAULT '0',
+  `CalendarFlags2` int(10) unsigned NOT NULL DEFAULT '0',
+  `CalendarFlags3` int(10) unsigned NOT NULL DEFAULT '0',
+  `CalendarFlags4` int(10) unsigned NOT NULL DEFAULT '0',
+  `CalendarFlags5` int(10) unsigned NOT NULL DEFAULT '0',
+  `CalendarFlags6` int(10) unsigned NOT NULL DEFAULT '0',
+  `CalendarFlags7` int(10) unsigned NOT NULL DEFAULT '0',
+  `CalendarFlags8` int(10) unsigned NOT NULL DEFAULT '0',
+  `CalendarFlags9` int(10) unsigned NOT NULL DEFAULT '0',
+  `CalendarFlags10` int(10) unsigned NOT NULL DEFAULT '0',
+  `HolidayNameID` int(10) unsigned NOT NULL DEFAULT '0',
+  `HolidayDescriptionID` int(10) unsigned NOT NULL DEFAULT '0',
+  `TextureFilename` text,
+  `Priority` int(10) unsigned NOT NULL DEFAULT '0',
+  `CalendarFilterType` int(10) unsigned NOT NULL DEFAULT '0',
+  `Flags` int(10) unsigned NOT NULL DEFAULT '0',
+  `VerifiedBuild` smallint(6) NOT NULL DEFAULT '0',
+  PRIMARY KEY (`ID`)
+) ENGINE=MyISAM DEFAULT CHARSET=utf8;
+/*!40101 SET character_set_client = @saved_cs_client */;
+
+--
+-- Table structure for table `holidays_locale`
+--
+
+DROP TABLE IF EXISTS `holidays_locale`;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `holidays_locale` (
+  `ID` int(10) unsigned NOT NULL DEFAULT '0',
+  `locale` varchar(4) NOT NULL,
+  `TextureFilename_lang` text,
+  `VerifiedBuild` smallint(6) NOT NULL DEFAULT '0',
+  PRIMARY KEY (`ID`,`locale`)
+) ENGINE=MyISAM DEFAULT CHARSET=utf8;
+/*!40101 SET character_set_client = @saved_cs_client */;
+
+--
+-- Table structure for table `hotfix_data`
+--
+
+DROP TABLE IF EXISTS `hotfix_data`;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `hotfix_data` (
+  `TableHash` int(10) unsigned NOT NULL DEFAULT '0',
+  `RecordID` int(10) NOT NULL,
+  `Timestamp` int(10) unsigned NOT NULL DEFAULT '0',
+  `Deleted` tinyint(3) unsigned NOT NULL DEFAULT '0',
+  PRIMARY KEY (`TableHash`,`RecordID`,`Timestamp`)
+) ENGINE=MyISAM DEFAULT CHARSET=utf8;
+/*!40101 SET character_set_client = @saved_cs_client */;
+
+--
+-- Table structure for table `item`
+--
+
+DROP TABLE IF EXISTS `item`;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `item` (
+  `ID` int(10) unsigned NOT NULL DEFAULT '0',
+  `Class` int(10) unsigned NOT NULL DEFAULT '0',
+  `SubClass` int(10) unsigned NOT NULL DEFAULT '0',
+  `SoundOverrideSubclass` int(11) NOT NULL DEFAULT '0',
+  `Material` int(11) NOT NULL DEFAULT '0',
+  `InventoryType` int(10) unsigned NOT NULL DEFAULT '0',
+  `Sheath` int(10) unsigned NOT NULL DEFAULT '0',
+  `FileDataID` int(10) unsigned NOT NULL DEFAULT '0',
+  `GroupSoundsID` int(10) unsigned NOT NULL DEFAULT '0',
+  `VerifiedBuild` smallint(6) NOT NULL DEFAULT '0',
+  PRIMARY KEY (`ID`)
+) ENGINE=MyISAM DEFAULT CHARSET=utf8;
+/*!40101 SET character_set_client = @saved_cs_client */;
+
+--
+-- Table structure for table `item_appearance`
+--
+
+DROP TABLE IF EXISTS `item_appearance`;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `item_appearance` (
+  `ID` int(10) unsigned NOT NULL DEFAULT '0',
+  `DisplayID` int(10) unsigned NOT NULL DEFAULT '0',
+  `IconFileDataID` int(10) unsigned NOT NULL DEFAULT '0',
+  `VerifiedBuild` smallint(6) NOT NULL DEFAULT '0',
+  PRIMARY KEY (`ID`)
+) ENGINE=MyISAM DEFAULT CHARSET=utf8;
+/*!40101 SET character_set_client = @saved_cs_client */;
+
+--
+-- Table structure for table `item_bonus`
+--
+
+DROP TABLE IF EXISTS `item_bonus`;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `item_bonus` (
+  `ID` int(10) unsigned NOT NULL DEFAULT '0',
+  `BonusListID` int(10) unsigned NOT NULL DEFAULT '0',
+  `Type` int(10) unsigned NOT NULL DEFAULT '0',
+  `Value1` int(11) NOT NULL DEFAULT '0',
+  `Value2` int(11) NOT NULL DEFAULT '0',
+  `Index` int(10) unsigned NOT NULL DEFAULT '0',
+  `VerifiedBuild` smallint(6) NOT NULL DEFAULT '0',
+  PRIMARY KEY (`ID`)
+) ENGINE=MyISAM DEFAULT CHARSET=utf8;
+/*!40101 SET character_set_client = @saved_cs_client */;
+
+--
+-- Table structure for table `item_bonus_tree_node`
+--
+
+DROP TABLE IF EXISTS `item_bonus_tree_node`;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `item_bonus_tree_node` (
+  `ID` int(10) unsigned NOT NULL DEFAULT '0',
+  `BonusTreeID` int(10) unsigned NOT NULL DEFAULT '0',
+  `BonusTreeModID` int(10) unsigned NOT NULL DEFAULT '0',
+  `SubTreeID` int(10) unsigned NOT NULL DEFAULT '0',
+  `BonusListID` int(10) unsigned NOT NULL DEFAULT '0',
+  `VerifiedBuild` smallint(6) NOT NULL DEFAULT '0',
+  PRIMARY KEY (`ID`)
+) ENGINE=MyISAM DEFAULT CHARSET=utf8;
+/*!40101 SET character_set_client = @saved_cs_client */;
+
+--
+-- Table structure for table `item_currency_cost`
+--
+
+DROP TABLE IF EXISTS `item_currency_cost`;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `item_currency_cost` (
+  `ID` int(10) unsigned NOT NULL DEFAULT '0',
+  `ItemId` int(10) unsigned NOT NULL DEFAULT '0',
+  `VerifiedBuild` smallint(6) NOT NULL DEFAULT '0',
+  PRIMARY KEY (`ID`),
+  UNIQUE KEY `idx_itemId` (`ItemId`)
+) ENGINE=MyISAM DEFAULT CHARSET=utf8;
+/*!40101 SET character_set_client = @saved_cs_client */;
+
+--
+-- Table structure for table `item_effect`
+--
+
+DROP TABLE IF EXISTS `item_effect`;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `item_effect` (
+  `ID` int(10) unsigned NOT NULL DEFAULT '0',
+  `ItemID` int(10) unsigned NOT NULL DEFAULT '0',
+  `OrderIndex` int(10) unsigned NOT NULL DEFAULT '0',
+  `SpellID` int(10) unsigned NOT NULL DEFAULT '0',
+  `Trigger` int(10) unsigned NOT NULL DEFAULT '0',
+  `Charges` int(10) unsigned NOT NULL DEFAULT '0',
+  `Cooldown` int(11) NOT NULL DEFAULT '0',
+  `Category` int(10) unsigned NOT NULL DEFAULT '0',
+  `CategoryCooldown` int(11) NOT NULL DEFAULT '0',
+  `VerifiedBuild` smallint(6) NOT NULL DEFAULT '0',
+  PRIMARY KEY (`ID`)
+) ENGINE=MyISAM DEFAULT CHARSET=utf8;
+/*!40101 SET character_set_client = @saved_cs_client */;
+
+--
+-- Table structure for table `item_extended_cost`
+--
+
+DROP TABLE IF EXISTS `item_extended_cost`;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `item_extended_cost` (
+  `ID` int(10) unsigned NOT NULL DEFAULT '0',
+  `RequiredArenaSlot` int(10) unsigned NOT NULL DEFAULT '0',
+  `RequiredItem1` int(10) unsigned NOT NULL DEFAULT '0',
+  `RequiredItem2` int(10) unsigned NOT NULL DEFAULT '0',
+  `RequiredItem3` int(10) unsigned NOT NULL DEFAULT '0',
+  `RequiredItem4` int(10) unsigned NOT NULL DEFAULT '0',
+  `RequiredItem5` int(10) unsigned NOT NULL DEFAULT '0',
+  `RequiredItemCount1` int(10) unsigned NOT NULL DEFAULT '0',
+  `RequiredItemCount2` int(10) unsigned NOT NULL DEFAULT '0',
+  `RequiredItemCount3` int(10) unsigned NOT NULL DEFAULT '0',
+  `RequiredItemCount4` int(10) unsigned NOT NULL DEFAULT '0',
+  `RequiredItemCount5` int(10) unsigned NOT NULL DEFAULT '0',
+  `RequiredPersonalArenaRating` int(10) unsigned NOT NULL DEFAULT '0',
+  `ItemPurchaseGroup` int(10) unsigned NOT NULL DEFAULT '0',
+  `RequiredCurrency1` int(10) unsigned NOT NULL DEFAULT '0',
+  `RequiredCurrency2` int(10) unsigned NOT NULL DEFAULT '0',
+  `RequiredCurrency3` int(10) unsigned NOT NULL DEFAULT '0',
+  `RequiredCurrency4` int(10) unsigned NOT NULL DEFAULT '0',
+  `RequiredCurrency5` int(10) unsigned NOT NULL DEFAULT '0',
+  `RequiredCurrencyCount1` int(10) unsigned NOT NULL DEFAULT '0',
+  `RequiredCurrencyCount2` int(10) unsigned NOT NULL DEFAULT '0',
+  `RequiredCurrencyCount3` int(10) unsigned NOT NULL DEFAULT '0',
+  `RequiredCurrencyCount4` int(10) unsigned NOT NULL DEFAULT '0',
+  `RequiredCurrencyCount5` int(10) unsigned NOT NULL DEFAULT '0',
+  `RequiredFactionId` int(10) unsigned NOT NULL DEFAULT '0',
+  `RequiredFactionStanding` int(10) unsigned NOT NULL DEFAULT '0',
+  `RequirementFlags` int(10) unsigned NOT NULL DEFAULT '0',
+  `RequiredAchievement` int(10) unsigned NOT NULL DEFAULT '0',
+  `RequiredMoney` int(10) unsigned NOT NULL DEFAULT '0',
+  `VerifiedBuild` smallint(6) NOT NULL DEFAULT '0',
+  PRIMARY KEY (`ID`)
+) ENGINE=MyISAM DEFAULT CHARSET=utf8;
+/*!40101 SET character_set_client = @saved_cs_client */;
+
+--
+-- Table structure for table `item_modified_appearance`
+--
+
+DROP TABLE IF EXISTS `item_modified_appearance`;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `item_modified_appearance` (
+  `ID` int(10) unsigned NOT NULL DEFAULT '0',
+  `ItemID` int(10) unsigned NOT NULL DEFAULT '0',
+  `AppearanceModID` int(10) unsigned NOT NULL DEFAULT '0',
+  `AppearanceID` int(10) unsigned NOT NULL DEFAULT '0',
+  `IconFileDataID` int(10) unsigned NOT NULL DEFAULT '0',
+  `Index` int(10) unsigned NOT NULL DEFAULT '0',
+  `VerifiedBuild` smallint(6) NOT NULL DEFAULT '0',
+  PRIMARY KEY (`ID`)
+) ENGINE=MyISAM DEFAULT CHARSET=utf8;
+/*!40101 SET character_set_client = @saved_cs_client */;
+
+--
+-- Table structure for table `item_sparse`
+--
+
+DROP TABLE IF EXISTS `item_sparse`;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `item_sparse` (
+  `ID` int(10) unsigned NOT NULL DEFAULT '0',
+  `Quality` int(10) unsigned NOT NULL DEFAULT '0',
+  `Flags1` int(10) unsigned NOT NULL DEFAULT '0',
+  `Flags2` int(10) unsigned NOT NULL DEFAULT '0',
+  `Flags3` int(10) unsigned NOT NULL DEFAULT '0',
+  `Unk1` float NOT NULL DEFAULT '0',
+  `Unk2` float NOT NULL DEFAULT '0',
+  `BuyCount` int(10) unsigned NOT NULL DEFAULT '0',
+  `BuyPrice` int(10) unsigned NOT NULL DEFAULT '0',
+  `SellPrice` int(10) unsigned NOT NULL DEFAULT '0',
+  `InventoryType` int(10) unsigned NOT NULL DEFAULT '0',
+  `AllowableClass` int(11) NOT NULL DEFAULT '0',
+  `AllowableRace` int(11) NOT NULL DEFAULT '0',
+  `ItemLevel` int(10) unsigned NOT NULL DEFAULT '0',
+  `RequiredLevel` int(11) NOT NULL DEFAULT '0',
+  `RequiredSkill` int(10) unsigned NOT NULL DEFAULT '0',
+  `RequiredSkillRank` int(10) unsigned NOT NULL DEFAULT '0',
+  `RequiredSpell` int(10) unsigned NOT NULL DEFAULT '0',
+  `RequiredHonorRank` int(10) unsigned NOT NULL DEFAULT '0',
+  `RequiredCityRank` int(10) unsigned NOT NULL DEFAULT '0',
+  `RequiredReputationFaction` int(10) unsigned NOT NULL DEFAULT '0',
+  `RequiredReputationRank` int(10) unsigned NOT NULL DEFAULT '0',
+  `MaxCount` int(10) unsigned NOT NULL DEFAULT '0',
+  `Stackable` int(10) unsigned NOT NULL DEFAULT '0',
+  `ContainerSlots` int(10) unsigned NOT NULL DEFAULT '0',
+  `ItemStatType1` int(11) NOT NULL DEFAULT '0',
+  `ItemStatType2` int(11) NOT NULL DEFAULT '0',
+  `ItemStatType3` int(11) NOT NULL DEFAULT '0',
+  `ItemStatType4` int(11) NOT NULL DEFAULT '0',
+  `ItemStatType5` int(11) NOT NULL DEFAULT '0',
+  `ItemStatType6` int(11) NOT NULL DEFAULT '0',
+  `ItemStatType7` int(11) NOT NULL DEFAULT '0',
+  `ItemStatType8` int(11) NOT NULL DEFAULT '0',
+  `ItemStatType9` int(11) NOT NULL DEFAULT '0',
+  `ItemStatType10` int(11) NOT NULL DEFAULT '0',
+  `ItemStatValue1` int(11) NOT NULL DEFAULT '0',
+  `ItemStatValue2` int(11) NOT NULL DEFAULT '0',
+  `ItemStatValue3` int(11) NOT NULL DEFAULT '0',
+  `ItemStatValue4` int(11) NOT NULL DEFAULT '0',
+  `ItemStatValue5` int(11) NOT NULL DEFAULT '0',
+  `ItemStatValue6` int(11) NOT NULL DEFAULT '0',
+  `ItemStatValue7` int(11) NOT NULL DEFAULT '0',
+  `ItemStatValue8` int(11) NOT NULL DEFAULT '0',
+  `ItemStatValue9` int(11) NOT NULL DEFAULT '0',
+  `ItemStatValue10` int(11) NOT NULL DEFAULT '0',
+  `ItemStatAllocation1` int(11) NOT NULL DEFAULT '0',
+  `ItemStatAllocation2` int(11) NOT NULL DEFAULT '0',
+  `ItemStatAllocation3` int(11) NOT NULL DEFAULT '0',
+  `ItemStatAllocation4` int(11) NOT NULL DEFAULT '0',
+  `ItemStatAllocation5` int(11) NOT NULL DEFAULT '0',
+  `ItemStatAllocation6` int(11) NOT NULL DEFAULT '0',
+  `ItemStatAllocation7` int(11) NOT NULL DEFAULT '0',
+  `ItemStatAllocation8` int(11) NOT NULL DEFAULT '0',
+  `ItemStatAllocation9` int(11) NOT NULL DEFAULT '0',
+  `ItemStatAllocation10` int(11) NOT NULL DEFAULT '0',
+  `ItemStatSocketCostMultiplier1` float NOT NULL DEFAULT '0',
+  `ItemStatSocketCostMultiplier2` float NOT NULL DEFAULT '0',
+  `ItemStatSocketCostMultiplier3` float NOT NULL DEFAULT '0',
+  `ItemStatSocketCostMultiplier4` float NOT NULL DEFAULT '0',
+  `ItemStatSocketCostMultiplier5` float NOT NULL DEFAULT '0',
+  `ItemStatSocketCostMultiplier6` float NOT NULL DEFAULT '0',
+  `ItemStatSocketCostMultiplier7` float NOT NULL DEFAULT '0',
+  `ItemStatSocketCostMultiplier8` float NOT NULL DEFAULT '0',
+  `ItemStatSocketCostMultiplier9` float NOT NULL DEFAULT '0',
+  `ItemStatSocketCostMultiplier10` float NOT NULL DEFAULT '0',
+  `ScalingStatDistribution` int(10) unsigned NOT NULL DEFAULT '0',
+  `DamageType` int(10) unsigned NOT NULL DEFAULT '0',
+  `Delay` int(10) unsigned NOT NULL DEFAULT '0',
+  `RangedModRange` float NOT NULL DEFAULT '0',
+  `Bonding` int(10) unsigned NOT NULL DEFAULT '0',
+  `Name` text,
+  `Name2` text,
+  `Name3` text,
+  `Name4` text,
+  `Description` text,
+  `PageText` int(10) unsigned NOT NULL DEFAULT '0',
+  `LanguageID` int(10) unsigned NOT NULL DEFAULT '0',
+  `PageMaterial` int(10) unsigned NOT NULL DEFAULT '0',
+  `StartQuest` int(10) unsigned NOT NULL DEFAULT '0',
+  `LockID` int(10) unsigned NOT NULL DEFAULT '0',
+  `Material` int(11) NOT NULL DEFAULT '0',
+  `Sheath` int(10) unsigned NOT NULL DEFAULT '0',
+  `RandomProperty` int(10) unsigned NOT NULL DEFAULT '0',
+  `RandomSuffix` int(10) unsigned NOT NULL DEFAULT '0',
+  `ItemSet` int(10) unsigned NOT NULL DEFAULT '0',
+  `Area` int(10) unsigned NOT NULL DEFAULT '0',
+  `Map` int(10) unsigned NOT NULL DEFAULT '0',
+  `BagFamily` int(10) unsigned NOT NULL DEFAULT '0',
+  `TotemCategory` int(10) unsigned NOT NULL DEFAULT '0',
+  `SocketColor1` int(10) unsigned NOT NULL DEFAULT '0',
+  `SocketColor2` int(10) unsigned NOT NULL DEFAULT '0',
+  `SocketColor3` int(10) unsigned NOT NULL DEFAULT '0',
+  `SocketBonus` int(10) unsigned NOT NULL DEFAULT '0',
+  `GemProperties` int(10) unsigned NOT NULL DEFAULT '0',
+  `ArmorDamageModifier` float NOT NULL DEFAULT '0',
+  `Duration` int(10) unsigned NOT NULL DEFAULT '0',
+  `ItemLimitCategory` int(10) unsigned NOT NULL DEFAULT '0',
+  `HolidayID` int(10) unsigned NOT NULL DEFAULT '0',
+  `StatScalingFactor` float NOT NULL DEFAULT '0',
+  `CurrencySubstitutionID` int(10) unsigned NOT NULL DEFAULT '0',
+  `CurrencySubstitutionCount` int(10) unsigned NOT NULL DEFAULT '0',
+  `ItemNameDescriptionID` int(10) unsigned NOT NULL DEFAULT '0',
+  `VerifiedBuild` smallint(6) NOT NULL DEFAULT '0',
+  PRIMARY KEY (`ID`)
+) ENGINE=MyISAM DEFAULT CHARSET=utf8;
+/*!40101 SET character_set_client = @saved_cs_client */;
+
+--
+-- Table structure for table `item_sparse_locale`
+--
+
+DROP TABLE IF EXISTS `item_sparse_locale`;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `item_sparse_locale` (
+  `ID` int(10) unsigned NOT NULL DEFAULT '0',
+  `locale` varchar(4) NOT NULL,
+  `Name_lang` text,
+  `Name2_lang` text,
+  `Name3_lang` text,
+  `Name4_lang` text,
+  `Description_lang` text,
+  `VerifiedBuild` smallint(6) NOT NULL DEFAULT '0',
+  PRIMARY KEY (`ID`,`locale`)
+) ENGINE=MyISAM DEFAULT CHARSET=utf8;
+/*!40101 SET character_set_client = @saved_cs_client */;
+
+--
+-- Table structure for table `item_x_bonus_tree`
+--
+
+DROP TABLE IF EXISTS `item_x_bonus_tree`;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `item_x_bonus_tree` (
+  `ID` int(10) unsigned NOT NULL DEFAULT '0',
+  `ItemID` int(10) unsigned NOT NULL DEFAULT '0',
+  `BonusTreeID` int(10) unsigned NOT NULL DEFAULT '0',
+  `VerifiedBuild` smallint(6) NOT NULL DEFAULT '0',
+  PRIMARY KEY (`ID`)
+) ENGINE=MyISAM DEFAULT CHARSET=utf8;
+/*!40101 SET character_set_client = @saved_cs_client */;
+
+--
+-- Table structure for table `key_chain`
+--
+
+DROP TABLE IF EXISTS `key_chain`;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `key_chain` (
+  `Id` int(10) unsigned NOT NULL DEFAULT '0',
+  `Key1` tinyint(3) unsigned NOT NULL DEFAULT '0',
+  `Key2` tinyint(3) unsigned NOT NULL DEFAULT '0',
+  `Key3` tinyint(3) unsigned NOT NULL DEFAULT '0',
+  `Key4` tinyint(3) unsigned NOT NULL DEFAULT '0',
+  `Key5` tinyint(3) unsigned NOT NULL DEFAULT '0',
+  `Key6` tinyint(3) unsigned NOT NULL DEFAULT '0',
+  `Key7` tinyint(3) unsigned NOT NULL DEFAULT '0',
+  `Key8` tinyint(3) unsigned NOT NULL DEFAULT '0',
+  `Key9` tinyint(3) unsigned NOT NULL DEFAULT '0',
+  `Key10` tinyint(3) unsigned NOT NULL DEFAULT '0',
+  `Key11` tinyint(3) unsigned NOT NULL DEFAULT '0',
+  `Key12` tinyint(3) unsigned NOT NULL DEFAULT '0',
+  `Key13` tinyint(3) unsigned NOT NULL DEFAULT '0',
+  `Key14` tinyint(3) unsigned NOT NULL DEFAULT '0',
+  `Key15` tinyint(3) unsigned NOT NULL DEFAULT '0',
+  `Key16` tinyint(3) unsigned NOT NULL DEFAULT '0',
+  `Key17` tinyint(3) unsigned NOT NULL DEFAULT '0',
+  `Key18` tinyint(3) unsigned NOT NULL DEFAULT '0',
+  `Key19` tinyint(3) unsigned NOT NULL DEFAULT '0',
+  `Key20` tinyint(3) unsigned NOT NULL DEFAULT '0',
+  `Key21` tinyint(3) unsigned NOT NULL DEFAULT '0',
+  `Key22` tinyint(3) unsigned NOT NULL DEFAULT '0',
+  `Key23` tinyint(3) unsigned NOT NULL DEFAULT '0',
+  `Key24` tinyint(3) unsigned NOT NULL DEFAULT '0',
+  `Key25` tinyint(3) unsigned NOT NULL DEFAULT '0',
+  `Key26` tinyint(3) unsigned NOT NULL DEFAULT '0',
+  `Key27` tinyint(3) unsigned NOT NULL DEFAULT '0',
+  `Key28` tinyint(3) unsigned NOT NULL DEFAULT '0',
+  `Key29` tinyint(3) unsigned NOT NULL DEFAULT '0',
+  `Key30` tinyint(3) unsigned NOT NULL DEFAULT '0',
+  `Key31` tinyint(3) unsigned NOT NULL DEFAULT '0',
+  `Key32` tinyint(3) unsigned NOT NULL DEFAULT '0',
+  `VerifiedBuild` smallint(6) NOT NULL DEFAULT '0',
+  PRIMARY KEY (`Id`)
+) ENGINE=MyISAM DEFAULT CHARSET=utf8;
+/*!40101 SET character_set_client = @saved_cs_client */;
+
+--
+-- Table structure for table `mount`
+--
+
+DROP TABLE IF EXISTS `mount`;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `mount` (
+  `Id` int(10) unsigned NOT NULL DEFAULT '0',
+  `MountTypeId` int(10) unsigned NOT NULL DEFAULT '0',
+  `DisplayId` int(10) unsigned NOT NULL DEFAULT '0',
+  `Flags` int(10) unsigned NOT NULL DEFAULT '0',
+  `Name` text,
+  `Description` text,
+  `SourceDescription` text,
+  `Source` int(10) unsigned NOT NULL DEFAULT '0',
+  `SpellId` int(10) unsigned NOT NULL DEFAULT '0',
+  `PlayerConditionId` int(10) unsigned NOT NULL DEFAULT '0',
+  `VerifiedBuild` smallint(6) NOT NULL DEFAULT '0',
+  PRIMARY KEY (`Id`)
+) ENGINE=MyISAM DEFAULT CHARSET=utf8;
+/*!40101 SET character_set_client = @saved_cs_client */;
+
+--
+-- Table structure for table `mount_locale`
+--
+
+DROP TABLE IF EXISTS `mount_locale`;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `mount_locale` (
+  `Id` int(10) unsigned NOT NULL DEFAULT '0',
+  `locale` varchar(4) NOT NULL,
+  `Name_lang` text,
+  `Description_lang` text,
+  `SourceDescription_lang` text,
+  `VerifiedBuild` smallint(6) NOT NULL DEFAULT '0',
+  PRIMARY KEY (`Id`,`locale`)
+) ENGINE=MyISAM DEFAULT CHARSET=utf8;
+/*!40101 SET character_set_client = @saved_cs_client */;
+
+--
+-- Table structure for table `override_spell_data`
+--
+
+DROP TABLE IF EXISTS `override_spell_data`;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `override_spell_data` (
+  `ID` int(10) unsigned NOT NULL DEFAULT '0',
+  `SpellID1` int(10) unsigned NOT NULL DEFAULT '0',
+  `SpellID2` int(10) unsigned NOT NULL DEFAULT '0',
+  `SpellID3` int(10) unsigned NOT NULL DEFAULT '0',
+  `SpellID4` int(10) unsigned NOT NULL DEFAULT '0',
+  `SpellID5` int(10) unsigned NOT NULL DEFAULT '0',
+  `SpellID6` int(10) unsigned NOT NULL DEFAULT '0',
+  `SpellID7` int(10) unsigned NOT NULL DEFAULT '0',
+  `SpellID8` int(10) unsigned NOT NULL DEFAULT '0',
+  `SpellID9` int(10) unsigned NOT NULL DEFAULT '0',
+  `SpellID10` int(10) unsigned NOT NULL DEFAULT '0',
+  `Flags` int(10) unsigned NOT NULL DEFAULT '0',
+  `PlayerActionbarFileDataID` int(10) unsigned NOT NULL DEFAULT '0',
+  `VerifiedBuild` smallint(6) NOT NULL DEFAULT '0',
+  PRIMARY KEY (`ID`)
+) ENGINE=MyISAM DEFAULT CHARSET=utf8;
+/*!40101 SET character_set_client = @saved_cs_client */;
+
+--
+-- Table structure for table `phase_group`
+--
+
+DROP TABLE IF EXISTS `phase_group`;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `phase_group` (
+  `ID` int(10) unsigned NOT NULL DEFAULT '0',
+  `PhaseID` int(10) unsigned NOT NULL DEFAULT '0',
+  `PhaseGroupID` int(10) unsigned NOT NULL DEFAULT '0',
+  `VerifiedBuild` smallint(6) NOT NULL DEFAULT '0',
+  PRIMARY KEY (`ID`)
+) ENGINE=MyISAM DEFAULT CHARSET=utf8;
+/*!40101 SET character_set_client = @saved_cs_client */;
+
+--
+-- Table structure for table `sound_entries`
+--
+
+DROP TABLE IF EXISTS `sound_entries`;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `sound_entries` (
+  `ID` int(10) unsigned NOT NULL DEFAULT '0',
+  `SoundType` int(10) unsigned NOT NULL DEFAULT '0',
+  `Name` text,
+  `FileDataID1` int(10) unsigned NOT NULL DEFAULT '0',
+  `FileDataID2` int(10) unsigned NOT NULL DEFAULT '0',
+  `FileDataID3` int(10) unsigned NOT NULL DEFAULT '0',
+  `FileDataID4` int(10) unsigned NOT NULL DEFAULT '0',
+  `FileDataID5` int(10) unsigned NOT NULL DEFAULT '0',
+  `FileDataID6` int(10) unsigned NOT NULL DEFAULT '0',
+  `FileDataID7` int(10) unsigned NOT NULL DEFAULT '0',
+  `FileDataID8` int(10) unsigned NOT NULL DEFAULT '0',
+  `FileDataID9` int(10) unsigned NOT NULL DEFAULT '0',
+  `FileDataID10` int(10) unsigned NOT NULL DEFAULT '0',
+  `FileDataID11` int(10) unsigned NOT NULL DEFAULT '0',
+  `FileDataID12` int(10) unsigned NOT NULL DEFAULT '0',
+  `FileDataID13` int(10) unsigned NOT NULL DEFAULT '0',
+  `FileDataID14` int(10) unsigned NOT NULL DEFAULT '0',
+  `FileDataID15` int(10) unsigned NOT NULL DEFAULT '0',
+  `FileDataID16` int(10) unsigned NOT NULL DEFAULT '0',
+  `FileDataID17` int(10) unsigned NOT NULL DEFAULT '0',
+  `FileDataID18` int(10) unsigned NOT NULL DEFAULT '0',
+  `FileDataID19` int(10) unsigned NOT NULL DEFAULT '0',
+  `FileDataID20` int(10) unsigned NOT NULL DEFAULT '0',
+  `Freq1` int(10) unsigned NOT NULL DEFAULT '0',
+  `Freq2` int(10) unsigned NOT NULL DEFAULT '0',
+  `Freq3` int(10) unsigned NOT NULL DEFAULT '0',
+  `Freq4` int(10) unsigned NOT NULL DEFAULT '0',
+  `Freq5` int(10) unsigned NOT NULL DEFAULT '0',
+  `Freq6` int(10) unsigned NOT NULL DEFAULT '0',
+  `Freq7` int(10) unsigned NOT NULL DEFAULT '0',
+  `Freq8` int(10) unsigned NOT NULL DEFAULT '0',
+  `Freq9` int(10) unsigned NOT NULL DEFAULT '0',
+  `Freq10` int(10) unsigned NOT NULL DEFAULT '0',
+  `Freq11` int(10) unsigned NOT NULL DEFAULT '0',
+  `Freq12` int(10) unsigned NOT NULL DEFAULT '0',
+  `Freq13` int(10) unsigned NOT NULL DEFAULT '0',
+  `Freq14` int(10) unsigned NOT NULL DEFAULT '0',
+  `Freq15` int(10) unsigned NOT NULL DEFAULT '0',
+  `Freq16` int(10) unsigned NOT NULL DEFAULT '0',
+  `Freq17` int(10) unsigned NOT NULL DEFAULT '0',
+  `Freq18` int(10) unsigned NOT NULL DEFAULT '0',
+  `Freq19` int(10) unsigned NOT NULL DEFAULT '0',
+  `Freq20` int(10) unsigned NOT NULL DEFAULT '0',
+  `VolumeFloat` float NOT NULL DEFAULT '0',
+  `Flags` int(10) unsigned NOT NULL DEFAULT '0',
+  `MinDistance` float NOT NULL DEFAULT '0',
+  `DistanceCutoff` float NOT NULL DEFAULT '0',
+  `EAXDef` int(10) unsigned NOT NULL DEFAULT '0',
+  `SoundEntriesAdvancedID` int(10) unsigned NOT NULL DEFAULT '0',
+  `VolumeVariationPlus` float NOT NULL DEFAULT '0',
+  `VolumeVariationMinus` float NOT NULL DEFAULT '0',
+  `PitchVariationPlus` float NOT NULL DEFAULT '0',
+  `PitchVariationMinus` float NOT NULL DEFAULT '0',
+  `PitchAdjust` float NOT NULL DEFAULT '0',
+  `DialogType` int(10) unsigned NOT NULL DEFAULT '0',
+  `BusOverwriteID` int(10) unsigned NOT NULL DEFAULT '0',
+  `VerifiedBuild` smallint(6) NOT NULL DEFAULT '0',
+  PRIMARY KEY (`ID`)
+) ENGINE=MyISAM DEFAULT CHARSET=utf8;
+/*!40101 SET character_set_client = @saved_cs_client */;
+
+--
+-- Table structure for table `sound_entries_locale`
+--
+
+DROP TABLE IF EXISTS `sound_entries_locale`;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `sound_entries_locale` (
+  `ID` int(10) unsigned NOT NULL DEFAULT '0',
+  `locale` varchar(4) NOT NULL,
+  `Name_lang` text,
+  `VerifiedBuild` smallint(6) NOT NULL DEFAULT '0',
+  PRIMARY KEY (`ID`,`locale`)
+) ENGINE=MyISAM DEFAULT CHARSET=utf8;
+/*!40101 SET character_set_client = @saved_cs_client */;
+
+--
+-- Table structure for table `spell_aura_restrictions`
+--
+
+DROP TABLE IF EXISTS `spell_aura_restrictions`;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `spell_aura_restrictions` (
+  `ID` int(10) unsigned NOT NULL DEFAULT '0',
+  `CasterAuraState` int(10) unsigned NOT NULL DEFAULT '0',
+  `TargetAuraState` int(10) unsigned NOT NULL DEFAULT '0',
+  `ExcludeCasterAuraState` int(10) unsigned NOT NULL DEFAULT '0',
+  `ExcludeTargetAuraState` int(10) unsigned NOT NULL DEFAULT '0',
+  `CasterAuraSpell` int(10) unsigned NOT NULL DEFAULT '0',
+  `TargetAuraSpell` int(10) unsigned NOT NULL DEFAULT '0',
+  `ExcludeCasterAuraSpell` int(10) unsigned NOT NULL DEFAULT '0',
+  `ExcludeTargetAuraSpell` int(10) unsigned NOT NULL DEFAULT '0',
+  `VerifiedBuild` smallint(6) NOT NULL DEFAULT '0',
+  PRIMARY KEY (`ID`)
+) ENGINE=MyISAM DEFAULT CHARSET=utf8;
+/*!40101 SET character_set_client = @saved_cs_client */;
+
+--
+-- Table structure for table `spell_casting_requirements`
+--
+
+DROP TABLE IF EXISTS `spell_casting_requirements`;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `spell_casting_requirements` (
+  `ID` int(10) unsigned NOT NULL DEFAULT '0',
+  `FacingCasterFlags` int(10) unsigned NOT NULL DEFAULT '0',
+  `MinFactionID` int(10) unsigned NOT NULL DEFAULT '0',
+  `MinReputation` int(10) unsigned NOT NULL DEFAULT '0',
+  `RequiredAreasID` int(10) unsigned NOT NULL DEFAULT '0',
+  `RequiredAuraVision` int(10) unsigned NOT NULL DEFAULT '0',
+  `RequiresSpellFocus` int(10) unsigned NOT NULL DEFAULT '0',
+  `VerifiedBuild` smallint(6) NOT NULL DEFAULT '0',
+  PRIMARY KEY (`ID`)
+) ENGINE=MyISAM DEFAULT CHARSET=utf8;
+/*!40101 SET character_set_client = @saved_cs_client */;
+
+--
+-- Table structure for table `spell_class_options`
+--
+
+DROP TABLE IF EXISTS `spell_class_options`;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `spell_class_options` (
+  `ID` int(10) unsigned NOT NULL DEFAULT '0',
+  `ModalNextSpell` int(10) unsigned NOT NULL DEFAULT '0',
+  `SpellClassMask1` int(10) unsigned NOT NULL DEFAULT '0',
+  `SpellClassMask2` int(10) unsigned NOT NULL DEFAULT '0',
+  `SpellClassMask3` int(10) unsigned NOT NULL DEFAULT '0',
+  `SpellClassMask4` int(10) unsigned NOT NULL DEFAULT '0',
+  `SpellClassSet` int(10) unsigned NOT NULL DEFAULT '0',
+  `VerifiedBuild` smallint(6) NOT NULL DEFAULT '0',
+  PRIMARY KEY (`ID`)
+) ENGINE=MyISAM DEFAULT CHARSET=utf8;
+/*!40101 SET character_set_client = @saved_cs_client */;
+
+--
+-- Table structure for table `spell_learn_spell`
+--
+
+DROP TABLE IF EXISTS `spell_learn_spell`;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `spell_learn_spell` (
+  `ID` int(10) unsigned NOT NULL DEFAULT '0',
+  `LearnSpellID` int(10) unsigned NOT NULL DEFAULT '0',
+  `SpellID` int(10) unsigned NOT NULL DEFAULT '0',
+  `OverridesSpellID` int(10) unsigned NOT NULL DEFAULT '0',
+  `VerifiedBuild` smallint(6) NOT NULL DEFAULT '0',
+  PRIMARY KEY (`ID`)
+) ENGINE=MyISAM DEFAULT CHARSET=utf8;
+/*!40101 SET character_set_client = @saved_cs_client */;
+
+--
+-- Table structure for table `spell_misc`
+--
+
+DROP TABLE IF EXISTS `spell_misc`;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `spell_misc` (
+  `ID` int(10) unsigned NOT NULL DEFAULT '0',
+  `Attributes` int(10) unsigned NOT NULL DEFAULT '0',
+  `AttributesEx` int(10) unsigned NOT NULL DEFAULT '0',
+  `AttributesExB` int(10) unsigned NOT NULL DEFAULT '0',
+  `AttributesExC` int(10) unsigned NOT NULL DEFAULT '0',
+  `AttributesExD` int(10) unsigned NOT NULL DEFAULT '0',
+  `AttributesExE` int(10) unsigned NOT NULL DEFAULT '0',
+  `AttributesExF` int(10) unsigned NOT NULL DEFAULT '0',
+  `AttributesExG` int(10) unsigned NOT NULL DEFAULT '0',
+  `AttributesExH` int(10) unsigned NOT NULL DEFAULT '0',
+  `AttributesExI` int(10) unsigned NOT NULL DEFAULT '0',
+  `AttributesExJ` int(10) unsigned NOT NULL DEFAULT '0',
+  `AttributesExK` int(10) unsigned NOT NULL DEFAULT '0',
+  `AttributesExL` int(10) unsigned NOT NULL DEFAULT '0',
+  `AttributesExM` int(10) unsigned NOT NULL DEFAULT '0',
+  `CastingTimeIndex` int(10) unsigned NOT NULL DEFAULT '0',
+  `DurationIndex` int(10) unsigned NOT NULL DEFAULT '0',
+  `RangeIndex` int(10) unsigned NOT NULL DEFAULT '0',
+  `Speed` float NOT NULL DEFAULT '0',
+  `SpellVisualID1` int(10) unsigned NOT NULL DEFAULT '0',
+  `SpellVisualID2` int(10) unsigned NOT NULL DEFAULT '0',
+  `SpellIconID` int(10) unsigned NOT NULL DEFAULT '0',
+  `ActiveIconID` int(10) unsigned NOT NULL DEFAULT '0',
+  `SchoolMask` int(10) unsigned NOT NULL DEFAULT '0',
+  `MultistrikeSpeedMod` float NOT NULL DEFAULT '0',
+  `VerifiedBuild` smallint(6) NOT NULL DEFAULT '0',
+  PRIMARY KEY (`ID`)
+) ENGINE=MyISAM DEFAULT CHARSET=utf8;
+/*!40101 SET character_set_client = @saved_cs_client */;
+
+--
+-- Table structure for table `spell_power`
+--
+
+DROP TABLE IF EXISTS `spell_power`;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `spell_power` (
+  `ID` int(10) unsigned NOT NULL DEFAULT '0',
+  `SpellID` int(10) unsigned NOT NULL DEFAULT '0',
+  `PowerIndex` int(10) unsigned NOT NULL DEFAULT '0',
+  `PowerType` int(10) unsigned NOT NULL DEFAULT '0',
+  `ManaCost` int(10) unsigned NOT NULL DEFAULT '0',
+  `ManaCostPerLevel` int(10) unsigned NOT NULL DEFAULT '0',
+  `ManaCostPerSecond` int(10) unsigned NOT NULL DEFAULT '0',
+  `ManaCostAdditional` int(10) unsigned NOT NULL DEFAULT '0',
+  `PowerDisplayID` int(10) unsigned NOT NULL DEFAULT '0',
+  `UnitPowerBarID` int(10) unsigned NOT NULL DEFAULT '0',
+  `ManaCostPercentage` float NOT NULL DEFAULT '0',
+  `ManaCostPercentagePerSecond` float NOT NULL DEFAULT '0',
+  `RequiredAura` int(10) unsigned NOT NULL DEFAULT '0',
+  `HealthCostPercentage` float NOT NULL DEFAULT '0',
+  `VerifiedBuild` smallint(6) NOT NULL DEFAULT '0',
+  PRIMARY KEY (`ID`)
+) ENGINE=MyISAM DEFAULT CHARSET=utf8;
+/*!40101 SET character_set_client = @saved_cs_client */;
+
+--
+-- Table structure for table `spell_power_difficulty`
+--
+
+DROP TABLE IF EXISTS `spell_power_difficulty`;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `spell_power_difficulty` (
+  `SpellPowerID` int(10) unsigned NOT NULL DEFAULT '0',
+  `DifficultyID` int(10) unsigned NOT NULL DEFAULT '0',
+  `PowerIndex` int(10) unsigned NOT NULL DEFAULT '0',
+  `VerifiedBuild` smallint(6) NOT NULL DEFAULT '0',
+  PRIMARY KEY (`SpellPowerID`)
+) ENGINE=MyISAM DEFAULT CHARSET=utf8;
+/*!40101 SET character_set_client = @saved_cs_client */;
+
+--
+-- Table structure for table `spell_reagents`
+--
+
+DROP TABLE IF EXISTS `spell_reagents`;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `spell_reagents` (
+  `ID` int(10) unsigned NOT NULL DEFAULT '0',
+  `Reagent1` int(11) NOT NULL DEFAULT '0',
+  `Reagent2` int(11) NOT NULL DEFAULT '0',
+  `Reagent3` int(11) NOT NULL DEFAULT '0',
+  `Reagent4` int(11) NOT NULL DEFAULT '0',
+  `Reagent5` int(11) NOT NULL DEFAULT '0',
+  `Reagent6` int(11) NOT NULL DEFAULT '0',
+  `Reagent7` int(11) NOT NULL DEFAULT '0',
+  `Reagent8` int(11) NOT NULL DEFAULT '0',
+  `ReagentCount1` int(10) unsigned NOT NULL DEFAULT '0',
+  `ReagentCount2` int(10) unsigned NOT NULL DEFAULT '0',
+  `ReagentCount3` int(10) unsigned NOT NULL DEFAULT '0',
+  `ReagentCount4` int(10) unsigned NOT NULL DEFAULT '0',
+  `ReagentCount5` int(10) unsigned NOT NULL DEFAULT '0',
+  `ReagentCount6` int(10) unsigned NOT NULL DEFAULT '0',
+  `ReagentCount7` int(10) unsigned NOT NULL DEFAULT '0',
+  `ReagentCount8` int(10) unsigned NOT NULL DEFAULT '0',
+  `CurrencyID` int(10) unsigned NOT NULL DEFAULT '0',
+  `CurrencyCount` int(10) unsigned NOT NULL DEFAULT '0',
+  `VerifiedBuild` smallint(6) NOT NULL DEFAULT '0',
+  PRIMARY KEY (`ID`)
+) ENGINE=MyISAM DEFAULT CHARSET=utf8;
+/*!40101 SET character_set_client = @saved_cs_client */;
+
+--
+-- Table structure for table `spell_rune_cost`
+--
+
+DROP TABLE IF EXISTS `spell_rune_cost`;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `spell_rune_cost` (
+  `ID` int(10) unsigned NOT NULL DEFAULT '0',
+  `Blood` int(10) unsigned NOT NULL DEFAULT '0',
+  `Unholy` int(10) unsigned NOT NULL DEFAULT '0',
+  `Frost` int(10) unsigned NOT NULL DEFAULT '0',
+  `Chromatic` int(10) unsigned NOT NULL DEFAULT '0',
+  `RunicPower` int(10) unsigned NOT NULL DEFAULT '0',
+  `VerifiedBuild` smallint(6) NOT NULL DEFAULT '0',
+  PRIMARY KEY (`ID`)
+) ENGINE=MyISAM DEFAULT CHARSET=utf8;
+/*!40101 SET character_set_client = @saved_cs_client */;
+
+--
+-- Table structure for table `spell_totems`
+--
+
+DROP TABLE IF EXISTS `spell_totems`;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `spell_totems` (
+  `ID` int(10) unsigned NOT NULL DEFAULT '0',
+  `RequiredTotemCategoryID1` int(10) unsigned NOT NULL DEFAULT '0',
+  `RequiredTotemCategoryID2` int(10) unsigned NOT NULL DEFAULT '0',
+  `Totem1` int(10) unsigned NOT NULL DEFAULT '0',
+  `Totem2` int(10) unsigned NOT NULL DEFAULT '0',
+  `VerifiedBuild` smallint(6) NOT NULL DEFAULT '0',
+  PRIMARY KEY (`ID`)
+) ENGINE=MyISAM DEFAULT CHARSET=utf8;
+/*!40101 SET character_set_client = @saved_cs_client */;
+
+--
+-- Table structure for table `taxi_nodes`
+--
+
+DROP TABLE IF EXISTS `taxi_nodes`;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `taxi_nodes` (
+  `ID` int(10) unsigned NOT NULL DEFAULT '0',
+  `MapID` int(10) unsigned NOT NULL DEFAULT '0',
+  `PosX` float NOT NULL DEFAULT '0',
+  `PosY` float NOT NULL DEFAULT '0',
+  `PosZ` float NOT NULL DEFAULT '0',
+  `Name` text,
+  `MountCreatureID1` int(10) unsigned NOT NULL DEFAULT '0',
+  `MountCreatureID2` int(10) unsigned NOT NULL DEFAULT '0',
+  `ConditionID` int(10) unsigned NOT NULL DEFAULT '0',
+  `LearnableIndex` int(10) unsigned NOT NULL DEFAULT '0',
+  `Flags` int(10) unsigned NOT NULL DEFAULT '0',
+  `MapOffsetX` float NOT NULL DEFAULT '0',
+  `MapOffsetY` float NOT NULL DEFAULT '0',
+  `VerifiedBuild` smallint(6) NOT NULL DEFAULT '0',
+  PRIMARY KEY (`ID`)
+) ENGINE=MyISAM DEFAULT CHARSET=utf8;
+/*!40101 SET character_set_client = @saved_cs_client */;
+
+--
+-- Table structure for table `taxi_nodes_locale`
+--
+
+DROP TABLE IF EXISTS `taxi_nodes_locale`;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `taxi_nodes_locale` (
+  `ID` int(10) unsigned NOT NULL DEFAULT '0',
+  `locale` varchar(4) NOT NULL,
+  `Name_lang` text,
+  `VerifiedBuild` smallint(6) NOT NULL DEFAULT '0',
+  PRIMARY KEY (`ID`,`locale`)
+) ENGINE=MyISAM DEFAULT CHARSET=utf8;
+/*!40101 SET character_set_client = @saved_cs_client */;
+
+--
+-- Table structure for table `taxi_path`
+--
+
+DROP TABLE IF EXISTS `taxi_path`;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `taxi_path` (
+  `ID` int(10) unsigned NOT NULL DEFAULT '0',
+  `From` int(10) unsigned NOT NULL DEFAULT '0',
+  `To` int(10) unsigned NOT NULL DEFAULT '0',
+  `Cost` int(10) unsigned NOT NULL DEFAULT '0',
+  `VerifiedBuild` smallint(6) NOT NULL DEFAULT '0',
+  PRIMARY KEY (`ID`)
+) ENGINE=MyISAM DEFAULT CHARSET=utf8;
+/*!40101 SET character_set_client = @saved_cs_client */;
+
+--
+-- Table structure for table `taxi_path_node`
+--
+
+DROP TABLE IF EXISTS `taxi_path_node`;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `taxi_path_node` (
+  `ID` int(10) unsigned NOT NULL DEFAULT '0',
+  `PathID` int(10) unsigned NOT NULL DEFAULT '0',
+  `NodeIndex` int(10) unsigned NOT NULL DEFAULT '0',
+  `MapID` int(10) unsigned NOT NULL DEFAULT '0',
+  `LocX` float NOT NULL DEFAULT '0',
+  `LocY` float NOT NULL DEFAULT '0',
+  `LocZ` float NOT NULL DEFAULT '0',
+  `Flags` int(10) unsigned NOT NULL DEFAULT '0',
+  `Delay` int(10) unsigned NOT NULL DEFAULT '0',
+  `ArrivalEventID` int(10) unsigned NOT NULL DEFAULT '0',
+  `DepartureEventID` int(10) unsigned NOT NULL DEFAULT '0',
+  `VerifiedBuild` smallint(6) NOT NULL DEFAULT '0',
+  PRIMARY KEY (`ID`)
+) ENGINE=MyISAM DEFAULT CHARSET=utf8;
+/*!40101 SET character_set_client = @saved_cs_client */;
+
+--
+-- Table structure for table `updates`
+--
+
+DROP TABLE IF EXISTS `updates`;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `updates` (
+  `name` varchar(200) NOT NULL COMMENT 'filename with extension of the update.',
+  `hash` char(40) DEFAULT '' COMMENT 'sha1 hash of the sql file.',
+  `state` enum('RELEASED','ARCHIVED') NOT NULL DEFAULT 'RELEASED' COMMENT 'defines if an update is released or archived.',
+  `timestamp` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT 'timestamp when the query was applied.',
+  `speed` int(10) unsigned NOT NULL DEFAULT '0' COMMENT 'time the query takes to apply in ms.',
+  PRIMARY KEY (`name`)
+) ENGINE=MyISAM DEFAULT CHARSET=utf8 COMMENT='List of all applied updates in this database.';
+/*!40101 SET character_set_client = @saved_cs_client */;
+
+--
+-- Table structure for table `updates_include`
+--
+
+DROP TABLE IF EXISTS `updates_include`;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `updates_include` (
+  `path` varchar(200) NOT NULL COMMENT 'directory to include. $ means relative to the source directory.',
+  `state` enum('RELEASED','ARCHIVED') NOT NULL DEFAULT 'RELEASED' COMMENT 'defines if the directory contains released or archived updates.',
+  PRIMARY KEY (`path`)
+) ENGINE=MyISAM DEFAULT CHARSET=utf8 COMMENT='List of directories where we want to include sql updates.';
+/*!40101 SET character_set_client = @saved_cs_client */;
+/*!40103 SET TIME_ZONE=@OLD_TIME_ZONE */;
+
+/*!40101 SET SQL_MODE=@OLD_SQL_MODE */;
+/*!40014 SET FOREIGN_KEY_CHECKS=@OLD_FOREIGN_KEY_CHECKS */;
+/*!40014 SET UNIQUE_CHECKS=@OLD_UNIQUE_CHECKS */;
+/*!40101 SET CHARACTER_SET_CLIENT=@OLD_CHARACTER_SET_CLIENT */;
+/*!40101 SET CHARACTER_SET_RESULTS=@OLD_CHARACTER_SET_RESULTS */;
+/*!40101 SET COLLATION_CONNECTION=@OLD_COLLATION_CONNECTION */;
+/*!40111 SET SQL_NOTES=@OLD_SQL_NOTES */;
+
+-- Dump completed on 2015-03-21 16:07:14
diff --git a/sql/base/dev/world_database.sql b/sql/base/dev/world_database.sql
index 76c899b6aed..76a07e6a56d 100644
--- a/sql/base/dev/world_database.sql
+++ b/sql/base/dev/world_database.sql
@@ -1,8 +1,8 @@
--- MySQL dump 10.15  Distrib 10.0.13-MariaDB, for Win64 (x86)
+-- MySQL dump 10.13  Distrib 5.6.9-rc, for Win64 (x86_64)
 --
 -- Host: localhost    Database: world
 -- ------------------------------------------------------
--- Server version	10.0.13-MariaDB
+-- Server version	5.6.9-rc
 
 /*!40101 SET @OLD_CHARACTER_SET_CLIENT=@@CHARACTER_SET_CLIENT */;
 /*!40101 SET @OLD_CHARACTER_SET_RESULTS=@@CHARACTER_SET_RESULTS */;
@@ -144,16 +144,11 @@ DROP TABLE IF EXISTS `areatrigger_teleport`;
 /*!40101 SET @saved_cs_client     = @@character_set_client */;
 /*!40101 SET character_set_client = utf8 */;
 CREATE TABLE `areatrigger_teleport` (
-  `id` mediumint(8) unsigned NOT NULL DEFAULT '0' COMMENT 'Identifier',
-  `name` text,
-  `target_map` smallint(5) unsigned NOT NULL DEFAULT '0',
-  `target_position_x` float NOT NULL DEFAULT '0',
-  `target_position_y` float NOT NULL DEFAULT '0',
-  `target_position_z` float NOT NULL DEFAULT '0',
-  `target_orientation` float NOT NULL DEFAULT '0',
-  `VerifiedBuild` smallint(5) DEFAULT '0',
-  PRIMARY KEY (`id`),
-  FULLTEXT KEY `name` (`name`)
+  `ID` mediumint(8) unsigned NOT NULL DEFAULT '0',
+  `PortLocID` mediumint(8) unsigned NOT NULL DEFAULT '0',
+  `Name` text,
+  PRIMARY KEY (`ID`),
+  FULLTEXT KEY `name` (`Name`)
 ) ENGINE=MyISAM DEFAULT CHARSET=utf8 ROW_FORMAT=FIXED COMMENT='Trigger System';
 /*!40101 SET character_set_client = @saved_cs_client */;
 
@@ -197,28 +192,16 @@ CREATE TABLE `battlemaster_entry` (
 /*!40101 SET character_set_client = @saved_cs_client */;
 
 --
--- Table structure for table `broadcast_text`
+-- Table structure for table `class_expansion_requirement`
 --
 
-DROP TABLE IF EXISTS `broadcast_text`;
+DROP TABLE IF EXISTS `class_expansion_requirement`;
 /*!40101 SET @saved_cs_client     = @@character_set_client */;
 /*!40101 SET character_set_client = utf8 */;
-CREATE TABLE `broadcast_text` (
-  `ID` mediumint(8) unsigned NOT NULL DEFAULT '0',
-  `Language` mediumint(8) unsigned NOT NULL DEFAULT '0',
-  `MaleText` longtext,
-  `FemaleText` longtext,
-  `EmoteID0` mediumint(8) unsigned NOT NULL DEFAULT '0',
-  `EmoteID1` mediumint(8) unsigned NOT NULL DEFAULT '0',
-  `EmoteID2` mediumint(8) unsigned NOT NULL DEFAULT '0',
-  `EmoteDelay0` mediumint(8) unsigned NOT NULL DEFAULT '0',
-  `EmoteDelay1` mediumint(8) unsigned NOT NULL DEFAULT '0',
-  `EmoteDelay2` mediumint(8) unsigned NOT NULL DEFAULT '0',
-  `SoundId` mediumint(8) unsigned NOT NULL DEFAULT '0',
-  `Unk1` mediumint(8) unsigned NOT NULL DEFAULT '0',
-  `Unk2` mediumint(8) unsigned NOT NULL DEFAULT '0',
-  `VerifiedBuild` smallint(5) DEFAULT '0',
-  PRIMARY KEY (`ID`)
+CREATE TABLE `class_expansion_requirement` (
+  `classID` tinyint(3) unsigned NOT NULL DEFAULT '0',
+  `expansion` tinyint(3) unsigned NOT NULL DEFAULT '0',
+  PRIMARY KEY (`classID`)
 ) ENGINE=MyISAM DEFAULT CHARSET=utf8;
 /*!40101 SET character_set_client = @saved_cs_client */;
 
@@ -272,12 +255,12 @@ DROP TABLE IF EXISTS `creature`;
 /*!40101 SET @saved_cs_client     = @@character_set_client */;
 /*!40101 SET character_set_client = utf8 */;
 CREATE TABLE `creature` (
-  `guid` int(10) unsigned NOT NULL AUTO_INCREMENT COMMENT 'Global Unique Identifier',
+  `guid` bigint(20) unsigned NOT NULL DEFAULT '0',
   `id` mediumint(8) unsigned NOT NULL DEFAULT '0' COMMENT 'Creature Identifier',
   `map` smallint(5) unsigned NOT NULL DEFAULT '0' COMMENT 'Map Identifier',
   `zoneId` smallint(5) unsigned NOT NULL DEFAULT '0' COMMENT 'Zone Identifier',
   `areaId` smallint(5) unsigned NOT NULL DEFAULT '0' COMMENT 'Area Identifier',
-  `spawnMask` tinyint(3) unsigned NOT NULL DEFAULT '1',
+  `spawnMask` int(10) unsigned NOT NULL DEFAULT '1',
   `phaseMask` int(10) unsigned NOT NULL DEFAULT '1',
   `PhaseId` int(10) DEFAULT '0',
   `PhaseGroup` int(10) DEFAULT '0',
@@ -311,7 +294,7 @@ DROP TABLE IF EXISTS `creature_addon`;
 /*!40101 SET @saved_cs_client     = @@character_set_client */;
 /*!40101 SET character_set_client = utf8 */;
 CREATE TABLE `creature_addon` (
-  `guid` int(10) unsigned NOT NULL DEFAULT '0',
+  `guid` bigint(20) unsigned NOT NULL DEFAULT '0',
   `path_id` int(10) unsigned NOT NULL DEFAULT '0',
   `mount` mediumint(8) unsigned NOT NULL DEFAULT '0',
   `bytes1` int(10) unsigned NOT NULL DEFAULT '0',
@@ -332,10 +315,6 @@ DROP TABLE IF EXISTS `creature_classlevelstats`;
 CREATE TABLE `creature_classlevelstats` (
   `level` tinyint(4) NOT NULL,
   `class` tinyint(4) NOT NULL,
-  `basehp0` mediumint(8) unsigned NOT NULL DEFAULT '1',
-  `basehp1` mediumint(8) unsigned NOT NULL DEFAULT '1',
-  `basehp2` mediumint(8) unsigned NOT NULL DEFAULT '1',
-  `basehp3` mediumint(8) unsigned NOT NULL DEFAULT '1',
   `basemana` mediumint(8) unsigned NOT NULL DEFAULT '1',
   `basearmor` mediumint(8) unsigned NOT NULL DEFAULT '1',
   `attackpower` smallint(6) NOT NULL DEFAULT '0',
@@ -344,6 +323,8 @@ CREATE TABLE `creature_classlevelstats` (
   `damage_exp1` float NOT NULL DEFAULT '0',
   `damage_exp2` float NOT NULL DEFAULT '0',
   `damage_exp3` float NOT NULL DEFAULT '0',
+  `damage_exp4` float NOT NULL DEFAULT '0',
+  `damage_exp5` float NOT NULL DEFAULT '0',
   `comment` text,
   PRIMARY KEY (`level`,`class`)
 ) ENGINE=MyISAM DEFAULT CHARSET=utf8;
@@ -375,8 +356,8 @@ DROP TABLE IF EXISTS `creature_formations`;
 /*!40101 SET @saved_cs_client     = @@character_set_client */;
 /*!40101 SET character_set_client = utf8 */;
 CREATE TABLE `creature_formations` (
-  `leaderGUID` int(10) unsigned NOT NULL,
-  `memberGUID` int(10) unsigned NOT NULL,
+  `leaderGUID` bigint(20) unsigned NOT NULL DEFAULT '0',
+  `memberGUID` bigint(20) unsigned NOT NULL DEFAULT '0',
   `dist` float unsigned NOT NULL,
   `angle` float unsigned NOT NULL,
   `groupAI` int(10) unsigned NOT NULL,
@@ -416,12 +397,11 @@ DROP TABLE IF EXISTS `creature_model_info`;
 /*!40101 SET @saved_cs_client     = @@character_set_client */;
 /*!40101 SET character_set_client = utf8 */;
 CREATE TABLE `creature_model_info` (
-  `modelid` mediumint(8) unsigned NOT NULL DEFAULT '0',
-  `bounding_radius` float NOT NULL DEFAULT '0',
-  `combat_reach` float NOT NULL DEFAULT '0',
-  `gender` tinyint(3) unsigned NOT NULL DEFAULT '2',
-  `modelid_other_gender` mediumint(8) unsigned NOT NULL DEFAULT '0',
-  PRIMARY KEY (`modelid`)
+  `DisplayID` mediumint(8) unsigned NOT NULL DEFAULT '0',
+  `BoundingRadius` float NOT NULL DEFAULT '0',
+  `CombatReach` float NOT NULL DEFAULT '0',
+  `DisplayID_Other_Gender` mediumint(8) unsigned NOT NULL DEFAULT '0',
+  PRIMARY KEY (`DisplayID`)
 ) ENGINE=MyISAM DEFAULT CHARSET=utf8 COMMENT='Creature System (Model related info)';
 /*!40101 SET character_set_client = @saved_cs_client */;
 
@@ -514,13 +494,13 @@ CREATE TABLE `creature_template` (
   `modelid2` mediumint(8) unsigned NOT NULL DEFAULT '0',
   `modelid3` mediumint(8) unsigned NOT NULL DEFAULT '0',
   `modelid4` mediumint(8) unsigned NOT NULL DEFAULT '0',
-  `name` char(100) NOT NULL DEFAULT '0',
-  `femaleName` char(100) NOT NULL,
-  `subname` char(100) DEFAULT NULL,
+  `name` char(200) NOT NULL DEFAULT '0',
+  `femaleName` char(200) NOT NULL,
+  `subname` char(200) DEFAULT NULL,
   `IconName` char(100) DEFAULT NULL,
   `gossip_menu_id` mediumint(8) unsigned NOT NULL DEFAULT '0',
-  `minlevel` tinyint(3) unsigned NOT NULL DEFAULT '1',
-  `maxlevel` tinyint(3) unsigned NOT NULL DEFAULT '1',
+  `minlevel` smallint(5) NOT NULL DEFAULT '1',
+  `maxlevel` smallint(5) NOT NULL DEFAULT '1',
   `exp` smallint(6) NOT NULL DEFAULT '0',
   `exp_unk` smallint(2) NOT NULL DEFAULT '0',
   `faction` smallint(5) unsigned NOT NULL DEFAULT '0',
@@ -538,7 +518,7 @@ CREATE TABLE `creature_template` (
   `unit_flags` int(10) unsigned NOT NULL DEFAULT '0',
   `unit_flags2` int(10) unsigned NOT NULL DEFAULT '0',
   `dynamicflags` int(10) unsigned NOT NULL DEFAULT '0',
-  `family` tinyint(4) NOT NULL DEFAULT '0',
+  `family` tinyint(3) unsigned NOT NULL DEFAULT '0',
   `trainer_type` tinyint(4) NOT NULL DEFAULT '0',
   `trainer_class` tinyint(3) unsigned NOT NULL DEFAULT '0',
   `trainer_race` tinyint(3) unsigned NOT NULL DEFAULT '0',
@@ -812,7 +792,7 @@ DROP TABLE IF EXISTS `game_event_creature`;
 /*!40101 SET character_set_client = utf8 */;
 CREATE TABLE `game_event_creature` (
   `eventEntry` tinyint(4) NOT NULL COMMENT 'Entry of the game event. Put negative entry to remove during event.',
-  `guid` int(10) unsigned NOT NULL,
+  `guid` bigint(20) unsigned NOT NULL DEFAULT '0',
   PRIMARY KEY (`guid`,`eventEntry`)
 ) ENGINE=MyISAM DEFAULT CHARSET=utf8;
 /*!40101 SET character_set_client = @saved_cs_client */;
@@ -841,7 +821,7 @@ DROP TABLE IF EXISTS `game_event_gameobject`;
 /*!40101 SET character_set_client = utf8 */;
 CREATE TABLE `game_event_gameobject` (
   `eventEntry` tinyint(4) NOT NULL COMMENT 'Entry of the game event. Put negative entry to remove during event.',
-  `guid` int(10) unsigned NOT NULL,
+  `guid` bigint(20) unsigned NOT NULL DEFAULT '0',
   PRIMARY KEY (`guid`,`eventEntry`)
 ) ENGINE=MyISAM DEFAULT CHARSET=utf8;
 /*!40101 SET character_set_client = @saved_cs_client */;
@@ -870,7 +850,7 @@ DROP TABLE IF EXISTS `game_event_model_equip`;
 /*!40101 SET character_set_client = utf8 */;
 CREATE TABLE `game_event_model_equip` (
   `eventEntry` tinyint(4) NOT NULL COMMENT 'Entry of the game event.',
-  `guid` int(10) unsigned NOT NULL DEFAULT '0',
+  `guid` bigint(20) unsigned NOT NULL DEFAULT '0',
   `modelid` mediumint(8) unsigned NOT NULL DEFAULT '0',
   `equipment_id` tinyint(3) unsigned NOT NULL DEFAULT '0',
   PRIMARY KEY (`guid`)
@@ -886,7 +866,7 @@ DROP TABLE IF EXISTS `game_event_npc_vendor`;
 /*!40101 SET character_set_client = utf8 */;
 CREATE TABLE `game_event_npc_vendor` (
   `eventEntry` tinyint(4) NOT NULL COMMENT 'Entry of the game event.',
-  `guid` mediumint(8) unsigned NOT NULL DEFAULT '0',
+  `guid` bigint(20) unsigned NOT NULL DEFAULT '0',
   `slot` smallint(6) NOT NULL DEFAULT '0',
   `item` mediumint(8) unsigned NOT NULL DEFAULT '0',
   `maxcount` mediumint(8) unsigned NOT NULL DEFAULT '0',
@@ -907,7 +887,7 @@ DROP TABLE IF EXISTS `game_event_npcflag`;
 /*!40101 SET character_set_client = utf8 */;
 CREATE TABLE `game_event_npcflag` (
   `eventEntry` tinyint(3) unsigned NOT NULL COMMENT 'Entry of the game event',
-  `guid` mediumint(8) unsigned NOT NULL DEFAULT '0',
+  `guid` bigint(20) unsigned NOT NULL DEFAULT '0',
   `npcflag` int(10) unsigned NOT NULL DEFAULT '0',
   PRIMARY KEY (`guid`,`eventEntry`)
 ) ENGINE=MyISAM DEFAULT CHARSET=utf8;
@@ -973,21 +953,6 @@ CREATE TABLE `game_event_seasonal_questrelation` (
 /*!40101 SET character_set_client = @saved_cs_client */;
 
 --
--- Table structure for table `game_graveyard_zone`
---
-
-DROP TABLE IF EXISTS `game_graveyard_zone`;
-/*!40101 SET @saved_cs_client     = @@character_set_client */;
-/*!40101 SET character_set_client = utf8 */;
-CREATE TABLE `game_graveyard_zone` (
-  `id` mediumint(8) unsigned NOT NULL DEFAULT '0',
-  `ghost_zone` mediumint(8) unsigned NOT NULL DEFAULT '0',
-  `faction` smallint(5) unsigned NOT NULL DEFAULT '0',
-  PRIMARY KEY (`id`,`ghost_zone`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COMMENT='Trigger System';
-/*!40101 SET character_set_client = @saved_cs_client */;
-
---
 -- Table structure for table `game_tele`
 --
 
@@ -1003,7 +968,7 @@ CREATE TABLE `game_tele` (
   `map` smallint(5) unsigned NOT NULL DEFAULT '0',
   `name` varchar(100) NOT NULL DEFAULT '',
   PRIMARY KEY (`id`)
-) ENGINE=MyISAM AUTO_INCREMENT=1524 DEFAULT CHARSET=utf8 COMMENT='Tele Command';
+) ENGINE=MyISAM AUTO_INCREMENT=1575 DEFAULT CHARSET=utf8 COMMENT='Tele Command';
 /*!40101 SET character_set_client = @saved_cs_client */;
 
 --
@@ -1040,12 +1005,12 @@ DROP TABLE IF EXISTS `gameobject`;
 /*!40101 SET @saved_cs_client     = @@character_set_client */;
 /*!40101 SET character_set_client = utf8 */;
 CREATE TABLE `gameobject` (
-  `guid` int(10) unsigned NOT NULL AUTO_INCREMENT COMMENT 'Global Unique Identifier',
+  `guid` bigint(20) unsigned NOT NULL DEFAULT '0',
   `id` mediumint(8) unsigned NOT NULL DEFAULT '0' COMMENT 'Gameobject Identifier',
   `map` smallint(5) unsigned NOT NULL DEFAULT '0' COMMENT 'Map Identifier',
   `zoneId` smallint(5) unsigned NOT NULL DEFAULT '0' COMMENT 'Zone Identifier',
   `areaId` smallint(5) unsigned NOT NULL DEFAULT '0' COMMENT 'Area Identifier',
-  `spawnMask` tinyint(3) unsigned NOT NULL DEFAULT '1',
+  `spawnMask` int(10) unsigned NOT NULL DEFAULT '1',
   `phaseMask` int(10) unsigned NOT NULL DEFAULT '1',
   `PhaseId` int(10) DEFAULT '0',
   `PhaseGroup` int(10) DEFAULT '0',
@@ -1139,38 +1104,39 @@ CREATE TABLE `gameobject_template` (
   `questItem4` int(11) unsigned NOT NULL DEFAULT '0',
   `questItem5` int(11) unsigned NOT NULL DEFAULT '0',
   `questItem6` int(11) unsigned NOT NULL DEFAULT '0',
-  `data0` int(10) unsigned NOT NULL DEFAULT '0',
-  `data1` int(11) NOT NULL DEFAULT '-1',
-  `data2` int(10) unsigned NOT NULL DEFAULT '0',
-  `data3` int(10) unsigned NOT NULL DEFAULT '0',
-  `data4` int(10) unsigned NOT NULL DEFAULT '0',
-  `data5` int(10) unsigned NOT NULL DEFAULT '0',
-  `data6` int(11) NOT NULL DEFAULT '-1',
-  `data7` int(10) unsigned NOT NULL DEFAULT '0',
-  `data8` int(10) unsigned NOT NULL DEFAULT '0',
-  `data9` int(10) unsigned NOT NULL DEFAULT '0',
-  `data10` int(10) unsigned NOT NULL DEFAULT '0',
-  `data11` int(10) unsigned NOT NULL DEFAULT '0',
-  `data12` int(10) unsigned NOT NULL DEFAULT '0',
-  `data13` int(10) unsigned NOT NULL DEFAULT '0',
-  `data14` int(10) unsigned NOT NULL DEFAULT '0',
-  `data15` int(10) unsigned NOT NULL DEFAULT '0',
-  `data16` int(10) unsigned NOT NULL DEFAULT '0',
-  `data17` int(10) unsigned NOT NULL DEFAULT '0',
-  `data18` int(10) unsigned NOT NULL DEFAULT '0',
-  `data19` int(10) unsigned NOT NULL DEFAULT '0',
-  `data20` int(10) unsigned NOT NULL DEFAULT '0',
-  `data21` int(10) unsigned NOT NULL DEFAULT '0',
-  `data22` int(10) unsigned NOT NULL DEFAULT '0',
-  `data23` int(10) unsigned NOT NULL DEFAULT '0',
-  `data24` int(10) NOT NULL DEFAULT '0',
-  `data25` int(10) NOT NULL DEFAULT '0',
-  `data26` int(10) NOT NULL DEFAULT '0',
-  `data27` int(10) NOT NULL DEFAULT '0',
-  `data28` int(10) NOT NULL DEFAULT '0',
-  `data29` int(10) NOT NULL DEFAULT '0',
-  `data30` int(10) NOT NULL DEFAULT '0',
-  `data31` int(10) NOT NULL DEFAULT '0',
+  `Data0` int(10) NOT NULL DEFAULT '0',
+  `Data1` int(10) NOT NULL DEFAULT '0',
+  `Data2` int(10) NOT NULL DEFAULT '0',
+  `Data3` int(10) NOT NULL DEFAULT '0',
+  `Data4` int(10) NOT NULL DEFAULT '0',
+  `Data5` int(10) NOT NULL DEFAULT '0',
+  `Data6` int(10) NOT NULL DEFAULT '0',
+  `Data7` int(10) NOT NULL DEFAULT '0',
+  `Data8` int(10) NOT NULL DEFAULT '0',
+  `Data9` int(10) NOT NULL DEFAULT '0',
+  `Data10` int(10) NOT NULL DEFAULT '0',
+  `Data11` int(10) NOT NULL DEFAULT '0',
+  `Data12` int(10) NOT NULL DEFAULT '0',
+  `Data13` int(10) NOT NULL DEFAULT '0',
+  `Data14` int(10) NOT NULL DEFAULT '0',
+  `Data15` int(10) NOT NULL DEFAULT '0',
+  `Data16` int(10) NOT NULL DEFAULT '0',
+  `Data17` int(10) NOT NULL DEFAULT '0',
+  `Data18` int(10) NOT NULL DEFAULT '0',
+  `Data19` int(10) NOT NULL DEFAULT '0',
+  `Data20` int(10) NOT NULL DEFAULT '0',
+  `Data21` int(10) NOT NULL DEFAULT '0',
+  `Data22` int(10) NOT NULL DEFAULT '0',
+  `Data23` int(10) NOT NULL DEFAULT '0',
+  `Data24` int(10) NOT NULL DEFAULT '0',
+  `Data25` int(10) NOT NULL DEFAULT '0',
+  `Data26` int(10) NOT NULL DEFAULT '0',
+  `Data27` int(10) NOT NULL DEFAULT '0',
+  `Data28` int(10) NOT NULL DEFAULT '0',
+  `Data29` int(10) NOT NULL DEFAULT '0',
+  `Data30` int(10) NOT NULL DEFAULT '0',
+  `Data31` int(10) NOT NULL DEFAULT '0',
+  `Data32` int(10) NOT NULL DEFAULT '0',
   `unkInt32` int(10) NOT NULL DEFAULT '0',
   `AIName` char(64) NOT NULL DEFAULT '',
   `ScriptName` varchar(64) NOT NULL DEFAULT '',
@@ -1220,17 +1186,19 @@ CREATE TABLE `gossip_menu_option` (
 /*!40101 SET character_set_client = @saved_cs_client */;
 
 --
--- Table structure for table `graveyard_orientation`
+-- Table structure for table `graveyard_zone`
 --
 
-DROP TABLE IF EXISTS `graveyard_orientation`;
+DROP TABLE IF EXISTS `graveyard_zone`;
 /*!40101 SET @saved_cs_client     = @@character_set_client */;
 /*!40101 SET character_set_client = utf8 */;
-CREATE TABLE `graveyard_orientation` (
-  `Id` int(10) unsigned NOT NULL DEFAULT '0',
-  `Orientation` float NOT NULL DEFAULT '0',
-  PRIMARY KEY (`Id`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COMMENT='Orientations used by graveyards';
+CREATE TABLE `graveyard_zone` (
+  `ID` mediumint(8) unsigned NOT NULL DEFAULT '0',
+  `GhostZone` mediumint(8) unsigned NOT NULL DEFAULT '0',
+  `Faction` smallint(5) unsigned NOT NULL DEFAULT '0',
+  `Comment` text,
+  PRIMARY KEY (`ID`,`GhostZone`)
+) ENGINE=MyISAM DEFAULT CHARSET=utf8 COMMENT='Trigger System';
 /*!40101 SET character_set_client = @saved_cs_client */;
 
 --
@@ -1241,41 +1209,25 @@ DROP TABLE IF EXISTS `guild_rewards`;
 /*!40101 SET @saved_cs_client     = @@character_set_client */;
 /*!40101 SET character_set_client = utf8 */;
 CREATE TABLE `guild_rewards` (
-  `entry` int(10) unsigned NOT NULL DEFAULT '0',
-  `standing` tinyint(3) unsigned DEFAULT '0',
-  `racemask` int(11) DEFAULT '0',
-  `price` bigint(20) unsigned DEFAULT '0',
-  `achievement` int(10) unsigned DEFAULT '0',
-  PRIMARY KEY (`entry`)
+  `ItemID` mediumint(8) unsigned NOT NULL DEFAULT '0',
+  `MinGuildRep` tinyint(3) unsigned DEFAULT '0',
+  `RaceMask` int(11) DEFAULT '0',
+  `Cost` bigint(20) unsigned DEFAULT '0',
+  PRIMARY KEY (`ItemID`)
 ) ENGINE=MyISAM DEFAULT CHARSET=utf8;
 /*!40101 SET character_set_client = @saved_cs_client */;
 
 --
--- Table structure for table `guild_xp_for_level`
+-- Table structure for table `guild_rewards_req_achievements`
 --
 
-DROP TABLE IF EXISTS `guild_xp_for_level`;
+DROP TABLE IF EXISTS `guild_rewards_req_achievements`;
 /*!40101 SET @saved_cs_client     = @@character_set_client */;
 /*!40101 SET character_set_client = utf8 */;
-CREATE TABLE `guild_xp_for_level` (
-  `lvl` tinyint(3) unsigned NOT NULL,
-  `xp_for_next_level` int(10) unsigned NOT NULL,
-  PRIMARY KEY (`lvl`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8;
-/*!40101 SET character_set_client = @saved_cs_client */;
-
---
--- Table structure for table `hotfix_data`
---
-
-DROP TABLE IF EXISTS `hotfix_data`;
-/*!40101 SET @saved_cs_client     = @@character_set_client */;
-/*!40101 SET character_set_client = utf8 */;
-CREATE TABLE `hotfix_data` (
-  `entry` int(10) unsigned NOT NULL,
-  `type` int(10) unsigned NOT NULL DEFAULT '0',
-  `hotfixDate` datetime NOT NULL DEFAULT '0000-00-00 00:00:00',
-  PRIMARY KEY (`entry`,`type`,`hotfixDate`)
+CREATE TABLE `guild_rewards_req_achievements` (
+  `ItemID` mediumint(8) unsigned NOT NULL DEFAULT '0',
+  `AchievementRequired` mediumint(8) unsigned NOT NULL DEFAULT '0',
+  PRIMARY KEY (`ItemID`,`AchievementRequired`)
 ) ENGINE=MyISAM DEFAULT CHARSET=utf8;
 /*!40101 SET character_set_client = @saved_cs_client */;
 
@@ -1364,157 +1316,6 @@ CREATE TABLE `item_script_names` (
 /*!40101 SET character_set_client = @saved_cs_client */;
 
 --
--- Table structure for table `item_template`
---
-
-DROP TABLE IF EXISTS `item_template`;
-/*!40101 SET @saved_cs_client     = @@character_set_client */;
-/*!40101 SET character_set_client = utf8 */;
-CREATE TABLE `item_template` (
-  `entry` mediumint(8) unsigned NOT NULL DEFAULT '0',
-  `class` tinyint(3) unsigned NOT NULL DEFAULT '0',
-  `subclass` tinyint(3) unsigned NOT NULL DEFAULT '0',
-  `SoundOverrideSubclass` tinyint(3) NOT NULL DEFAULT '-1',
-  `name` varchar(255) NOT NULL DEFAULT '',
-  `displayid` mediumint(8) unsigned NOT NULL DEFAULT '0',
-  `Quality` tinyint(3) unsigned NOT NULL DEFAULT '0',
-  `Flags` int(10) unsigned NOT NULL DEFAULT '0',
-  `FlagsExtra` int(10) unsigned NOT NULL DEFAULT '0',
-  `Unk430_1` float unsigned NOT NULL DEFAULT '1',
-  `Unk430_2` float NOT NULL DEFAULT '1',
-  `BuyCount` tinyint(3) unsigned NOT NULL DEFAULT '1',
-  `BuyPrice` bigint(20) NOT NULL DEFAULT '0',
-  `SellPrice` int(10) unsigned NOT NULL DEFAULT '0',
-  `InventoryType` tinyint(3) unsigned NOT NULL DEFAULT '0',
-  `AllowableClass` int(11) NOT NULL DEFAULT '-1',
-  `AllowableRace` int(11) NOT NULL DEFAULT '-1',
-  `ItemLevel` smallint(5) unsigned NOT NULL DEFAULT '0',
-  `RequiredLevel` tinyint(3) unsigned NOT NULL DEFAULT '0',
-  `RequiredSkill` smallint(5) unsigned NOT NULL DEFAULT '0',
-  `RequiredSkillRank` smallint(5) unsigned NOT NULL DEFAULT '0',
-  `requiredspell` mediumint(8) unsigned NOT NULL DEFAULT '0',
-  `requiredhonorrank` mediumint(8) unsigned NOT NULL DEFAULT '0',
-  `RequiredCityRank` mediumint(8) unsigned NOT NULL DEFAULT '0',
-  `RequiredReputationFaction` smallint(5) unsigned NOT NULL DEFAULT '0',
-  `RequiredReputationRank` smallint(5) unsigned NOT NULL DEFAULT '0',
-  `maxcount` int(11) NOT NULL DEFAULT '0',
-  `stackable` int(11) DEFAULT '1',
-  `ContainerSlots` tinyint(3) unsigned NOT NULL DEFAULT '0',
-  `stat_type1` tinyint(3) unsigned NOT NULL DEFAULT '0',
-  `stat_value1` smallint(6) NOT NULL DEFAULT '0',
-  `stat_unk1_1` int(11) NOT NULL DEFAULT '0',
-  `stat_unk2_1` int(11) NOT NULL DEFAULT '0',
-  `stat_type2` tinyint(3) unsigned NOT NULL DEFAULT '0',
-  `stat_value2` smallint(6) NOT NULL DEFAULT '0',
-  `stat_unk1_2` int(11) NOT NULL DEFAULT '0',
-  `stat_unk2_2` int(11) NOT NULL DEFAULT '0',
-  `stat_type3` tinyint(3) unsigned NOT NULL DEFAULT '0',
-  `stat_value3` smallint(6) NOT NULL DEFAULT '0',
-  `stat_unk1_3` int(11) NOT NULL DEFAULT '0',
-  `stat_unk2_3` int(11) NOT NULL DEFAULT '0',
-  `stat_type4` tinyint(3) unsigned NOT NULL DEFAULT '0',
-  `stat_value4` smallint(6) NOT NULL DEFAULT '0',
-  `stat_unk1_4` int(11) NOT NULL DEFAULT '0',
-  `stat_unk2_4` int(11) NOT NULL DEFAULT '0',
-  `stat_type5` tinyint(3) unsigned NOT NULL DEFAULT '0',
-  `stat_value5` smallint(6) NOT NULL DEFAULT '0',
-  `stat_unk1_5` int(11) NOT NULL DEFAULT '0',
-  `stat_unk2_5` int(11) NOT NULL DEFAULT '0',
-  `stat_type6` tinyint(3) unsigned NOT NULL DEFAULT '0',
-  `stat_value6` smallint(6) NOT NULL DEFAULT '0',
-  `stat_unk1_6` int(11) NOT NULL DEFAULT '0',
-  `stat_unk2_6` int(11) NOT NULL DEFAULT '0',
-  `stat_type7` tinyint(3) unsigned NOT NULL DEFAULT '0',
-  `stat_value7` smallint(6) NOT NULL DEFAULT '0',
-  `stat_unk1_7` int(11) NOT NULL DEFAULT '0',
-  `stat_unk2_7` int(11) NOT NULL DEFAULT '0',
-  `stat_type8` tinyint(3) unsigned NOT NULL DEFAULT '0',
-  `stat_value8` smallint(6) NOT NULL DEFAULT '0',
-  `stat_unk1_8` int(11) NOT NULL DEFAULT '0',
-  `stat_unk2_8` int(11) NOT NULL DEFAULT '0',
-  `stat_type9` tinyint(3) unsigned NOT NULL DEFAULT '0',
-  `stat_value9` smallint(6) NOT NULL DEFAULT '0',
-  `stat_unk1_9` int(11) NOT NULL DEFAULT '0',
-  `stat_unk2_9` int(11) NOT NULL DEFAULT '0',
-  `stat_type10` tinyint(3) unsigned NOT NULL DEFAULT '0',
-  `stat_value10` smallint(6) NOT NULL DEFAULT '0',
-  `stat_unk1_10` int(11) NOT NULL DEFAULT '0',
-  `stat_unk2_10` int(11) NOT NULL DEFAULT '0',
-  `ScalingStatDistribution` smallint(6) NOT NULL DEFAULT '0',
-  `DamageType` tinyint(3) unsigned NOT NULL DEFAULT '0',
-  `delay` smallint(5) unsigned NOT NULL DEFAULT '1000',
-  `RangedModRange` float NOT NULL DEFAULT '0',
-  `spellid_1` mediumint(8) NOT NULL DEFAULT '0',
-  `spelltrigger_1` tinyint(3) unsigned NOT NULL DEFAULT '0',
-  `spellcharges_1` smallint(6) NOT NULL DEFAULT '0',
-  `spellcooldown_1` int(11) NOT NULL DEFAULT '-1',
-  `spellcategory_1` smallint(5) unsigned NOT NULL DEFAULT '0',
-  `spellcategorycooldown_1` int(11) NOT NULL DEFAULT '-1',
-  `spellid_2` mediumint(8) NOT NULL DEFAULT '0',
-  `spelltrigger_2` tinyint(3) unsigned NOT NULL DEFAULT '0',
-  `spellcharges_2` smallint(6) NOT NULL DEFAULT '0',
-  `spellcooldown_2` int(11) NOT NULL DEFAULT '-1',
-  `spellcategory_2` smallint(5) unsigned NOT NULL DEFAULT '0',
-  `spellcategorycooldown_2` int(11) NOT NULL DEFAULT '-1',
-  `spellid_3` mediumint(8) NOT NULL DEFAULT '0',
-  `spelltrigger_3` tinyint(3) unsigned NOT NULL DEFAULT '0',
-  `spellcharges_3` smallint(6) NOT NULL DEFAULT '0',
-  `spellcooldown_3` int(11) NOT NULL DEFAULT '-1',
-  `spellcategory_3` smallint(5) unsigned NOT NULL DEFAULT '0',
-  `spellcategorycooldown_3` int(11) NOT NULL DEFAULT '-1',
-  `spellid_4` mediumint(8) NOT NULL DEFAULT '0',
-  `spelltrigger_4` tinyint(3) unsigned NOT NULL DEFAULT '0',
-  `spellcharges_4` smallint(6) NOT NULL DEFAULT '0',
-  `spellcooldown_4` int(11) NOT NULL DEFAULT '-1',
-  `spellcategory_4` smallint(5) unsigned NOT NULL DEFAULT '0',
-  `spellcategorycooldown_4` int(11) NOT NULL DEFAULT '-1',
-  `spellid_5` mediumint(8) NOT NULL DEFAULT '0',
-  `spelltrigger_5` tinyint(3) unsigned NOT NULL DEFAULT '0',
-  `spellcharges_5` smallint(6) NOT NULL DEFAULT '0',
-  `spellcooldown_5` int(11) NOT NULL DEFAULT '-1',
-  `spellcategory_5` smallint(5) unsigned NOT NULL DEFAULT '0',
-  `spellcategorycooldown_5` int(11) NOT NULL DEFAULT '-1',
-  `bonding` tinyint(3) unsigned NOT NULL DEFAULT '0',
-  `description` varchar(255) NOT NULL DEFAULT '',
-  `PageText` mediumint(8) unsigned NOT NULL DEFAULT '0',
-  `LanguageID` tinyint(3) unsigned NOT NULL DEFAULT '0',
-  `PageMaterial` tinyint(3) unsigned NOT NULL DEFAULT '0',
-  `startquest` mediumint(8) unsigned NOT NULL DEFAULT '0',
-  `lockid` mediumint(8) unsigned NOT NULL DEFAULT '0',
-  `Material` tinyint(4) NOT NULL DEFAULT '0',
-  `sheath` tinyint(3) unsigned NOT NULL DEFAULT '0',
-  `RandomProperty` mediumint(8) NOT NULL DEFAULT '0',
-  `RandomSuffix` mediumint(8) unsigned NOT NULL DEFAULT '0',
-  `itemset` mediumint(8) unsigned NOT NULL DEFAULT '0',
-  `MaxDurability` smallint(5) unsigned NOT NULL DEFAULT '0',
-  `area` mediumint(8) unsigned NOT NULL DEFAULT '0',
-  `Map` smallint(6) NOT NULL DEFAULT '0',
-  `BagFamily` mediumint(8) NOT NULL DEFAULT '0',
-  `TotemCategory` mediumint(8) NOT NULL DEFAULT '0',
-  `socketColor_1` tinyint(4) NOT NULL DEFAULT '0',
-  `socketContent_1` mediumint(8) NOT NULL DEFAULT '0',
-  `socketColor_2` tinyint(4) NOT NULL DEFAULT '0',
-  `socketContent_2` mediumint(8) NOT NULL DEFAULT '0',
-  `socketColor_3` tinyint(4) NOT NULL DEFAULT '0',
-  `socketContent_3` mediumint(8) NOT NULL DEFAULT '0',
-  `socketBonus` mediumint(8) NOT NULL DEFAULT '0',
-  `GemProperties` mediumint(8) NOT NULL DEFAULT '0',
-  `ArmorDamageModifier` float NOT NULL DEFAULT '0',
-  `duration` int(10) unsigned NOT NULL DEFAULT '0',
-  `ItemLimitCategory` smallint(6) NOT NULL DEFAULT '0',
-  `HolidayId` int(11) unsigned NOT NULL DEFAULT '0',
-  `StatScalingFactor` float NOT NULL DEFAULT '0',
-  `CurrencySubstitutionId` int(10) unsigned NOT NULL DEFAULT '0',
-  `CurrencySubstitutionCount` int(10) unsigned NOT NULL DEFAULT '0',
-  `flagsCustom` int(10) unsigned NOT NULL DEFAULT '0',
-  `VerifiedBuild` smallint(5) DEFAULT '0',
-  PRIMARY KEY (`entry`),
-  KEY `idx_name` (`name`),
-  KEY `items_index` (`class`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 ROW_FORMAT=FIXED COMMENT='Item System';
-/*!40101 SET character_set_client = @saved_cs_client */;
-
---
 -- Table structure for table `item_template_addon`
 --
 
@@ -1533,51 +1334,6 @@ CREATE TABLE `item_template_addon` (
 /*!40101 SET character_set_client = @saved_cs_client */;
 
 --
--- Table structure for table `keychain_db2`
---
-
-DROP TABLE IF EXISTS `keychain_db2`;
-/*!40101 SET @saved_cs_client     = @@character_set_client */;
-/*!40101 SET character_set_client = utf8 */;
-CREATE TABLE `keychain_db2` (
-  `keyId` int(10) unsigned NOT NULL DEFAULT '0',
-  `k1` tinyint(3) unsigned NOT NULL DEFAULT '0',
-  `k2` tinyint(3) unsigned NOT NULL DEFAULT '0',
-  `k3` tinyint(3) unsigned NOT NULL DEFAULT '0',
-  `k4` tinyint(3) unsigned NOT NULL DEFAULT '0',
-  `k5` tinyint(3) unsigned NOT NULL DEFAULT '0',
-  `k6` tinyint(3) unsigned NOT NULL DEFAULT '0',
-  `k7` tinyint(3) unsigned NOT NULL DEFAULT '0',
-  `k8` tinyint(3) unsigned NOT NULL DEFAULT '0',
-  `k9` tinyint(3) unsigned NOT NULL DEFAULT '0',
-  `k10` tinyint(3) unsigned NOT NULL DEFAULT '0',
-  `k11` tinyint(3) unsigned NOT NULL DEFAULT '0',
-  `k12` tinyint(3) unsigned NOT NULL DEFAULT '0',
-  `k13` tinyint(3) unsigned NOT NULL DEFAULT '0',
-  `k14` tinyint(3) unsigned NOT NULL DEFAULT '0',
-  `k15` tinyint(3) unsigned NOT NULL DEFAULT '0',
-  `k16` tinyint(3) unsigned NOT NULL DEFAULT '0',
-  `k17` tinyint(3) unsigned NOT NULL DEFAULT '0',
-  `k18` tinyint(3) unsigned NOT NULL DEFAULT '0',
-  `k19` tinyint(3) unsigned NOT NULL DEFAULT '0',
-  `k20` tinyint(3) unsigned NOT NULL DEFAULT '0',
-  `k21` tinyint(3) unsigned NOT NULL DEFAULT '0',
-  `k22` tinyint(3) unsigned NOT NULL DEFAULT '0',
-  `k23` tinyint(3) unsigned NOT NULL DEFAULT '0',
-  `k24` tinyint(3) unsigned NOT NULL DEFAULT '0',
-  `k25` tinyint(3) unsigned NOT NULL DEFAULT '0',
-  `k26` tinyint(3) unsigned NOT NULL DEFAULT '0',
-  `k27` tinyint(3) unsigned NOT NULL DEFAULT '0',
-  `k28` tinyint(3) unsigned NOT NULL DEFAULT '0',
-  `k29` tinyint(3) unsigned NOT NULL DEFAULT '0',
-  `k30` tinyint(3) unsigned NOT NULL DEFAULT '0',
-  `k31` tinyint(3) unsigned NOT NULL DEFAULT '0',
-  `k32` tinyint(3) unsigned NOT NULL DEFAULT '0',
-  PRIMARY KEY (`keyId`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8;
-/*!40101 SET character_set_client = @saved_cs_client */;
-
---
 -- Table structure for table `lfg_dungeon_rewards`
 --
 
@@ -1621,8 +1377,8 @@ DROP TABLE IF EXISTS `linked_respawn`;
 /*!40101 SET @saved_cs_client     = @@character_set_client */;
 /*!40101 SET character_set_client = utf8 */;
 CREATE TABLE `linked_respawn` (
-  `guid` int(10) unsigned NOT NULL COMMENT 'dependent creature',
-  `linkedGuid` int(10) unsigned NOT NULL COMMENT 'master creature',
+  `guid` bigint(20) unsigned NOT NULL DEFAULT '0',
+  `linkedGuid` bigint(20) unsigned NOT NULL DEFAULT '0',
   `linkType` tinyint(3) unsigned NOT NULL DEFAULT '0',
   PRIMARY KEY (`guid`,`linkType`)
 ) ENGINE=MyISAM DEFAULT CHARSET=utf8 ROW_FORMAT=DYNAMIC COMMENT='Creature Respawn Link System';
@@ -1658,36 +1414,6 @@ CREATE TABLE `locales_achievement_reward` (
 /*!40101 SET character_set_client = @saved_cs_client */;
 
 --
--- Table structure for table `locales_broadcast_text`
---
-
-DROP TABLE IF EXISTS `locales_broadcast_text`;
-/*!40101 SET @saved_cs_client     = @@character_set_client */;
-/*!40101 SET character_set_client = utf8 */;
-CREATE TABLE `locales_broadcast_text` (
-  `ID` mediumint(8) unsigned NOT NULL DEFAULT '0',
-  `MaleText_loc1` longtext,
-  `MaleText_loc2` longtext,
-  `MaleText_loc3` longtext,
-  `MaleText_loc4` longtext,
-  `MaleText_loc5` longtext,
-  `MaleText_loc6` longtext,
-  `MaleText_loc7` longtext,
-  `MaleText_loc8` longtext,
-  `FemaleText_loc1` longtext,
-  `FemaleText_loc2` longtext,
-  `FemaleText_loc3` longtext,
-  `FemaleText_loc4` longtext,
-  `FemaleText_loc5` longtext,
-  `FemaleText_loc6` longtext,
-  `FemaleText_loc7` longtext,
-  `FemaleText_loc8` longtext,
-  `VerifiedBuild` smallint(5) DEFAULT '0',
-  PRIMARY KEY (`ID`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8;
-/*!40101 SET character_set_client = @saved_cs_client */;
-
---
 -- Table structure for table `locales_creature`
 --
 
@@ -1809,36 +1535,6 @@ CREATE TABLE `locales_gossip_menu_option` (
 /*!40101 SET character_set_client = @saved_cs_client */;
 
 --
--- Table structure for table `locales_item`
---
-
-DROP TABLE IF EXISTS `locales_item`;
-/*!40101 SET @saved_cs_client     = @@character_set_client */;
-/*!40101 SET character_set_client = utf8 */;
-CREATE TABLE `locales_item` (
-  `entry` mediumint(8) unsigned NOT NULL DEFAULT '0',
-  `name_loc1` varchar(100) NOT NULL DEFAULT '',
-  `name_loc2` varchar(100) NOT NULL DEFAULT '',
-  `name_loc3` varchar(100) NOT NULL DEFAULT '',
-  `name_loc4` varchar(100) NOT NULL DEFAULT '',
-  `name_loc5` varchar(100) NOT NULL DEFAULT '',
-  `name_loc6` varchar(100) NOT NULL DEFAULT '',
-  `name_loc7` varchar(100) NOT NULL DEFAULT '',
-  `name_loc8` varchar(100) NOT NULL DEFAULT '',
-  `description_loc1` varchar(255) DEFAULT NULL,
-  `description_loc2` varchar(255) DEFAULT NULL,
-  `description_loc3` varchar(255) DEFAULT NULL,
-  `description_loc4` varchar(255) DEFAULT NULL,
-  `description_loc5` varchar(255) DEFAULT NULL,
-  `description_loc6` varchar(255) DEFAULT NULL,
-  `description_loc7` varchar(255) DEFAULT NULL,
-  `description_loc8` varchar(255) DEFAULT NULL,
-  `VerifiedBuild` smallint(5) DEFAULT '0',
-  PRIMARY KEY (`entry`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8;
-/*!40101 SET character_set_client = @saved_cs_client */;
-
---
 -- Table structure for table `locales_npc_text`
 --
 
@@ -1987,7 +1683,7 @@ DROP TABLE IF EXISTS `locales_page_text`;
 /*!40101 SET @saved_cs_client     = @@character_set_client */;
 /*!40101 SET character_set_client = utf8 */;
 CREATE TABLE `locales_page_text` (
-  `entry` mediumint(8) unsigned NOT NULL DEFAULT '0',
+  `ID` mediumint(8) unsigned NOT NULL DEFAULT '0',
   `Text_loc1` longtext,
   `Text_loc2` longtext,
   `Text_loc3` longtext,
@@ -1996,7 +1692,7 @@ CREATE TABLE `locales_page_text` (
   `Text_loc6` longtext,
   `Text_loc7` longtext,
   `Text_loc8` longtext,
-  PRIMARY KEY (`entry`)
+  PRIMARY KEY (`ID`)
 ) ENGINE=MyISAM DEFAULT CHARSET=utf8;
 /*!40101 SET character_set_client = @saved_cs_client */;
 
@@ -2008,16 +1704,16 @@ DROP TABLE IF EXISTS `locales_points_of_interest`;
 /*!40101 SET @saved_cs_client     = @@character_set_client */;
 /*!40101 SET character_set_client = utf8 */;
 CREATE TABLE `locales_points_of_interest` (
-  `entry` mediumint(8) unsigned NOT NULL DEFAULT '0',
-  `icon_name_loc1` text,
-  `icon_name_loc2` text,
-  `icon_name_loc3` text,
-  `icon_name_loc4` text,
-  `icon_name_loc5` text,
-  `icon_name_loc6` text,
-  `icon_name_loc7` text,
-  `icon_name_loc8` text,
-  PRIMARY KEY (`entry`)
+  `ID` mediumint(8) unsigned NOT NULL DEFAULT '0',
+  `Name_loc1` text,
+  `Name_loc2` text,
+  `Name_loc3` text,
+  `Name_loc4` text,
+  `Name_loc5` text,
+  `Name_loc6` text,
+  `Name_loc7` text,
+  `Name_loc8` text,
+  PRIMARY KEY (`ID`)
 ) ENGINE=MyISAM DEFAULT CHARSET=utf8;
 /*!40101 SET character_set_client = @saved_cs_client */;
 
@@ -2341,13 +2037,13 @@ DROP TABLE IF EXISTS `npc_trainer`;
 /*!40101 SET @saved_cs_client     = @@character_set_client */;
 /*!40101 SET character_set_client = utf8 */;
 CREATE TABLE `npc_trainer` (
-  `entry` mediumint(8) unsigned NOT NULL DEFAULT '0',
-  `spell` mediumint(8) NOT NULL DEFAULT '0',
-  `spellcost` int(10) unsigned NOT NULL DEFAULT '0',
-  `reqskill` smallint(5) unsigned NOT NULL DEFAULT '0',
-  `reqskillvalue` smallint(5) unsigned NOT NULL DEFAULT '0',
-  `reqlevel` tinyint(3) unsigned NOT NULL DEFAULT '0',
-  PRIMARY KEY (`entry`,`spell`)
+  `ID` mediumint(8) unsigned NOT NULL DEFAULT '0',
+  `SpellID` mediumint(8) NOT NULL DEFAULT '0',
+  `MoneyCost` int(10) unsigned NOT NULL DEFAULT '0',
+  `ReqSkillLine` smallint(5) unsigned NOT NULL DEFAULT '0',
+  `ReqSkillRank` smallint(5) unsigned NOT NULL DEFAULT '0',
+  `ReqLevel` tinyint(3) unsigned NOT NULL DEFAULT '0',
+  PRIMARY KEY (`ID`,`SpellID`)
 ) ENGINE=MyISAM DEFAULT CHARSET=utf8;
 /*!40101 SET character_set_client = @saved_cs_client */;
 
@@ -2395,11 +2091,11 @@ DROP TABLE IF EXISTS `page_text`;
 /*!40101 SET @saved_cs_client     = @@character_set_client */;
 /*!40101 SET character_set_client = utf8 */;
 CREATE TABLE `page_text` (
-  `entry` mediumint(8) unsigned NOT NULL DEFAULT '0',
-  `text` longtext NOT NULL,
-  `next_page` mediumint(8) unsigned NOT NULL DEFAULT '0',
+  `ID` mediumint(8) unsigned NOT NULL DEFAULT '0',
+  `Text` longtext,
+  `NextPageID` mediumint(8) unsigned NOT NULL DEFAULT '0',
   `VerifiedBuild` smallint(5) DEFAULT '0',
-  PRIMARY KEY (`entry`)
+  PRIMARY KEY (`ID`)
 ) ENGINE=MyISAM DEFAULT CHARSET=utf8 COMMENT='Item System';
 /*!40101 SET character_set_client = @saved_cs_client */;
 
@@ -2597,11 +2293,11 @@ CREATE TABLE `player_levelstats` (
   `race` tinyint(3) unsigned NOT NULL,
   `class` tinyint(3) unsigned NOT NULL,
   `level` tinyint(3) unsigned NOT NULL,
-  `str` tinyint(3) unsigned NOT NULL,
-  `agi` tinyint(3) unsigned NOT NULL,
-  `sta` tinyint(3) unsigned NOT NULL,
-  `inte` tinyint(3) unsigned NOT NULL,
-  `spi` tinyint(3) unsigned NOT NULL,
+  `str` smallint(6) unsigned NOT NULL COMMENT 'strength',
+  `agi` smallint(6) unsigned NOT NULL COMMENT 'agility',
+  `sta` smallint(6) unsigned NOT NULL COMMENT 'stamina',
+  `inte` smallint(6) unsigned NOT NULL COMMENT 'intellect',
+  `spi` smallint(6) unsigned NOT NULL COMMENT 'spirit',
   PRIMARY KEY (`race`,`class`,`level`)
 ) ENGINE=MyISAM DEFAULT CHARSET=utf8 PACK_KEYS=0 COMMENT='Stores levels stats.';
 /*!40101 SET character_set_client = @saved_cs_client */;
@@ -2614,9 +2310,9 @@ DROP TABLE IF EXISTS `player_xp_for_level`;
 /*!40101 SET @saved_cs_client     = @@character_set_client */;
 /*!40101 SET character_set_client = utf8 */;
 CREATE TABLE `player_xp_for_level` (
-  `lvl` tinyint(3) unsigned NOT NULL,
-  `xp_for_next_level` int(10) unsigned NOT NULL,
-  PRIMARY KEY (`lvl`)
+  `Level` tinyint(3) unsigned NOT NULL,
+  `Experience` float unsigned NOT NULL,
+  PRIMARY KEY (`Level`)
 ) ENGINE=MyISAM DEFAULT CHARSET=utf8;
 /*!40101 SET character_set_client = @saved_cs_client */;
 
@@ -2691,23 +2387,6 @@ CREATE TABLE `playercreateinfo_item` (
 /*!40101 SET character_set_client = @saved_cs_client */;
 
 --
--- Table structure for table `playercreateinfo_skills`
---
-
-DROP TABLE IF EXISTS `playercreateinfo_skills`;
-/*!40101 SET @saved_cs_client     = @@character_set_client */;
-/*!40101 SET character_set_client = utf8 */;
-CREATE TABLE `playercreateinfo_skills` (
-  `raceMask` int(10) unsigned NOT NULL,
-  `classMask` int(10) unsigned NOT NULL,
-  `skill` smallint(5) unsigned NOT NULL,
-  `rank` smallint(5) unsigned NOT NULL DEFAULT '0',
-  `comment` varchar(255) DEFAULT NULL,
-  PRIMARY KEY (`raceMask`,`classMask`,`skill`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8;
-/*!40101 SET character_set_client = @saved_cs_client */;
-
---
 -- Table structure for table `playercreateinfo_spell_custom`
 --
 
@@ -2731,15 +2410,15 @@ DROP TABLE IF EXISTS `points_of_interest`;
 /*!40101 SET @saved_cs_client     = @@character_set_client */;
 /*!40101 SET character_set_client = utf8 */;
 CREATE TABLE `points_of_interest` (
-  `entry` mediumint(8) unsigned NOT NULL DEFAULT '0',
-  `x` float NOT NULL DEFAULT '0',
-  `y` float NOT NULL DEFAULT '0',
-  `icon` mediumint(8) unsigned NOT NULL DEFAULT '0',
-  `flags` mediumint(8) unsigned NOT NULL DEFAULT '0',
-  `data` mediumint(8) unsigned NOT NULL DEFAULT '0',
-  `icon_name` text NOT NULL,
+  `ID` mediumint(8) unsigned NOT NULL DEFAULT '0',
+  `PositionX` float NOT NULL DEFAULT '0',
+  `PositionY` float NOT NULL DEFAULT '0',
+  `Icon` mediumint(8) unsigned NOT NULL DEFAULT '0',
+  `Flags` mediumint(8) unsigned NOT NULL DEFAULT '0',
+  `Importance` mediumint(8) unsigned NOT NULL DEFAULT '0',
+  `Name` text,
   `VerifiedBuild` smallint(5) DEFAULT '0',
-  PRIMARY KEY (`entry`)
+  PRIMARY KEY (`ID`)
 ) ENGINE=MyISAM DEFAULT CHARSET=utf8;
 /*!40101 SET character_set_client = @saved_cs_client */;
 
@@ -2751,7 +2430,7 @@ DROP TABLE IF EXISTS `pool_creature`;
 /*!40101 SET @saved_cs_client     = @@character_set_client */;
 /*!40101 SET character_set_client = utf8 */;
 CREATE TABLE `pool_creature` (
-  `guid` int(10) unsigned NOT NULL DEFAULT '0',
+  `guid` bigint(20) unsigned NOT NULL DEFAULT '0',
   `pool_entry` mediumint(8) unsigned NOT NULL DEFAULT '0',
   `chance` float unsigned NOT NULL DEFAULT '0',
   `description` varchar(255) DEFAULT NULL,
@@ -2768,7 +2447,7 @@ DROP TABLE IF EXISTS `pool_gameobject`;
 /*!40101 SET @saved_cs_client     = @@character_set_client */;
 /*!40101 SET character_set_client = utf8 */;
 CREATE TABLE `pool_gameobject` (
-  `guid` int(10) unsigned NOT NULL DEFAULT '0',
+  `guid` bigint(20) unsigned NOT NULL DEFAULT '0',
   `pool_entry` mediumint(8) unsigned NOT NULL DEFAULT '0',
   `chance` float unsigned NOT NULL DEFAULT '0',
   `description` varchar(255) DEFAULT NULL,
@@ -2847,6 +2526,91 @@ CREATE TABLE `prospecting_loot_template` (
 /*!40101 SET character_set_client = @saved_cs_client */;
 
 --
+-- Table structure for table `quest_details`
+--
+
+DROP TABLE IF EXISTS `quest_details`;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `quest_details` (
+  `ID` mediumint(8) unsigned NOT NULL DEFAULT '0',
+  `Emote1` smallint(5) unsigned NOT NULL DEFAULT '0',
+  `Emote2` smallint(5) unsigned NOT NULL DEFAULT '0',
+  `Emote3` smallint(5) unsigned NOT NULL DEFAULT '0',
+  `Emote4` smallint(5) unsigned NOT NULL DEFAULT '0',
+  `EmoteDelay1` int(10) unsigned NOT NULL DEFAULT '0',
+  `EmoteDelay2` int(10) unsigned NOT NULL DEFAULT '0',
+  `EmoteDelay3` int(10) unsigned NOT NULL DEFAULT '0',
+  `EmoteDelay4` int(10) unsigned NOT NULL DEFAULT '0',
+  `VerifiedBuild` smallint(5) NOT NULL DEFAULT '0',
+  PRIMARY KEY (`ID`)
+) ENGINE=MyISAM DEFAULT CHARSET=utf8;
+/*!40101 SET character_set_client = @saved_cs_client */;
+
+--
+-- Table structure for table `quest_greeting`
+--
+
+DROP TABLE IF EXISTS `quest_greeting`;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `quest_greeting` (
+  `ID` mediumint(8) unsigned NOT NULL DEFAULT '0',
+  `Type` tinyint(3) unsigned NOT NULL DEFAULT '0',
+  `GreetEmoteType` smallint(5) unsigned NOT NULL DEFAULT '0',
+  `GreetEmoteDelay` int(10) unsigned NOT NULL DEFAULT '0',
+  `Greeting` text,
+  `VerifiedBuild` smallint(5) NOT NULL DEFAULT '0',
+  PRIMARY KEY (`ID`,`Type`)
+) ENGINE=MyISAM DEFAULT CHARSET=utf8;
+/*!40101 SET character_set_client = @saved_cs_client */;
+
+--
+-- Table structure for table `quest_objectives`
+--
+
+DROP TABLE IF EXISTS `quest_objectives`;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `quest_objectives` (
+  `ID` mediumint(8) unsigned NOT NULL DEFAULT '0',
+  `QuestID` mediumint(8) unsigned NOT NULL DEFAULT '0',
+  `Type` tinyint(3) unsigned NOT NULL DEFAULT '0',
+  `StorageIndex` tinyint(3) NOT NULL DEFAULT '0',
+  `ObjectID` int(10) NOT NULL DEFAULT '0',
+  `Amount` int(10) NOT NULL DEFAULT '0',
+  `Flags` int(10) unsigned NOT NULL DEFAULT '0',
+  `UnkFloat` float NOT NULL DEFAULT '0',
+  `Description` text,
+  `VerifiedBuild` smallint(5) NOT NULL DEFAULT '0',
+  PRIMARY KEY (`ID`)
+) ENGINE=MyISAM DEFAULT CHARSET=utf8;
+/*!40101 SET character_set_client = @saved_cs_client */;
+
+--
+-- Table structure for table `quest_offer_reward`
+--
+
+DROP TABLE IF EXISTS `quest_offer_reward`;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `quest_offer_reward` (
+  `ID` mediumint(8) unsigned NOT NULL DEFAULT '0',
+  `Emote1` smallint(5) unsigned NOT NULL DEFAULT '0',
+  `Emote2` smallint(5) unsigned NOT NULL DEFAULT '0',
+  `Emote3` smallint(5) unsigned NOT NULL DEFAULT '0',
+  `Emote4` smallint(5) unsigned NOT NULL DEFAULT '0',
+  `EmoteDelay1` int(10) unsigned NOT NULL DEFAULT '0',
+  `EmoteDelay2` int(10) unsigned NOT NULL DEFAULT '0',
+  `EmoteDelay3` int(10) unsigned NOT NULL DEFAULT '0',
+  `EmoteDelay4` int(10) unsigned NOT NULL DEFAULT '0',
+  `RewardText` text,
+  `VerifiedBuild` smallint(5) NOT NULL DEFAULT '0',
+  PRIMARY KEY (`ID`)
+) ENGINE=MyISAM DEFAULT CHARSET=utf8;
+/*!40101 SET character_set_client = @saved_cs_client */;
+
+--
 -- Table structure for table `quest_poi`
 --
 
@@ -2887,6 +2651,25 @@ CREATE TABLE `quest_poi_points` (
 /*!40101 SET character_set_client = @saved_cs_client */;
 
 --
+-- Table structure for table `quest_request_items`
+--
+
+DROP TABLE IF EXISTS `quest_request_items`;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `quest_request_items` (
+  `ID` mediumint(8) unsigned NOT NULL DEFAULT '0',
+  `EmoteOnComplete` smallint(5) unsigned NOT NULL DEFAULT '0',
+  `EmoteOnIncomplete` smallint(5) unsigned NOT NULL DEFAULT '0',
+  `EmoteOnCompleteDelay` int(10) unsigned NOT NULL DEFAULT '0',
+  `EmoteOnIncompleteDelay` int(10) unsigned NOT NULL DEFAULT '0',
+  `CompletionText` text,
+  `VerifiedBuild` smallint(5) NOT NULL DEFAULT '0',
+  PRIMARY KEY (`ID`)
+) ENGINE=MyISAM DEFAULT CHARSET=utf8;
+/*!40101 SET character_set_client = @saved_cs_client */;
+
+--
 -- Table structure for table `quest_template`
 --
 
@@ -2894,177 +2677,173 @@ DROP TABLE IF EXISTS `quest_template`;
 /*!40101 SET @saved_cs_client     = @@character_set_client */;
 /*!40101 SET character_set_client = utf8 */;
 CREATE TABLE `quest_template` (
-  `Id` mediumint(8) unsigned NOT NULL DEFAULT '0',
-  `Method` tinyint(3) unsigned NOT NULL DEFAULT '2',
-  `Level` smallint(3) NOT NULL DEFAULT '1',
-  `MinLevel` smallint(6) NOT NULL DEFAULT '0',
-  `MaxLevel` smallint(6) NOT NULL DEFAULT '0',
-  `ZoneOrSort` smallint(6) NOT NULL DEFAULT '0',
-  `Type` smallint(5) unsigned NOT NULL DEFAULT '0',
-  `SuggestedPlayers` tinyint(3) unsigned NOT NULL DEFAULT '0',
-  `LimitTime` int(10) unsigned NOT NULL DEFAULT '0',
-  `RequiredClasses` smallint(5) unsigned NOT NULL DEFAULT '0',
-  `RequiredRaces` mediumint(8) unsigned NOT NULL DEFAULT '0',
-  `RequiredSkillId` smallint(5) unsigned NOT NULL DEFAULT '0',
+  `ID` int(10) unsigned NOT NULL DEFAULT '0',
+  `QuestType` tinyint(3) unsigned NOT NULL DEFAULT '2',
+  `QuestLevel` int(11) NOT NULL DEFAULT '-1',
+  `QuestPackageID` int(10) unsigned NOT NULL DEFAULT '0',
+  `MinLevel` int(11) NOT NULL DEFAULT '0',
+  `QuestSortID` smallint(6) NOT NULL DEFAULT '0',
+  `QuestInfoID` smallint(5) unsigned NOT NULL DEFAULT '0',
+  `SuggestedGroupNum` tinyint(3) unsigned NOT NULL DEFAULT '0',
+  `RewardNextQuest` int(10) unsigned NOT NULL DEFAULT '0',
+  `RewardXPDifficulty` int(10) unsigned NOT NULL DEFAULT '0',
+  `Float10` float NOT NULL DEFAULT '1',
+  `RewardMoney` int(11) NOT NULL DEFAULT '0',
+  `RewardMoneyDifficulty` int(10) unsigned NOT NULL DEFAULT '0',
+  `Float13` float NOT NULL DEFAULT '1',
+  `RewardBonusMoney` int(10) unsigned NOT NULL DEFAULT '0',
+  `RewardDisplaySpell` int(10) unsigned NOT NULL DEFAULT '0',
+  `RewardSpell` int(10) unsigned NOT NULL DEFAULT '0',
+  `RewardHonor` int(10) unsigned NOT NULL DEFAULT '0',
+  `RewardKillHonor` int(10) unsigned NOT NULL DEFAULT '0',
+  `StartItem` int(10) unsigned NOT NULL DEFAULT '0',
+  `Flags` int(10) unsigned NOT NULL DEFAULT '0',
+  `FlagsEx` int(10) unsigned NOT NULL DEFAULT '0',
+  `RewardItem1` int(10) unsigned NOT NULL DEFAULT '0',
+  `RewardAmount1` int(10) unsigned NOT NULL DEFAULT '0',
+  `RewardItem2` int(10) unsigned NOT NULL DEFAULT '0',
+  `RewardAmount2` int(10) unsigned NOT NULL DEFAULT '0',
+  `RewardItem3` int(10) unsigned NOT NULL DEFAULT '0',
+  `RewardAmount3` int(10) unsigned NOT NULL DEFAULT '0',
+  `RewardItem4` int(10) unsigned NOT NULL DEFAULT '0',
+  `RewardAmount4` int(10) unsigned NOT NULL DEFAULT '0',
+  `ItemDrop1` int(10) unsigned NOT NULL DEFAULT '0',
+  `ItemDropQuantity1` int(10) unsigned NOT NULL DEFAULT '0',
+  `ItemDrop2` int(10) unsigned NOT NULL DEFAULT '0',
+  `ItemDropQuantity2` int(10) unsigned NOT NULL DEFAULT '0',
+  `ItemDrop3` int(10) unsigned NOT NULL DEFAULT '0',
+  `ItemDropQuantity3` int(10) unsigned NOT NULL DEFAULT '0',
+  `ItemDrop4` int(10) unsigned NOT NULL DEFAULT '0',
+  `ItemDropQuantity4` int(10) unsigned NOT NULL DEFAULT '0',
+  `RewardChoiceItemID1` int(10) unsigned NOT NULL DEFAULT '0',
+  `RewardChoiceItemQuantity1` int(10) unsigned NOT NULL DEFAULT '0',
+  `RewardChoiceItemDisplayID1` int(10) unsigned NOT NULL DEFAULT '0',
+  `RewardChoiceItemID2` int(10) unsigned NOT NULL DEFAULT '0',
+  `RewardChoiceItemQuantity2` int(10) unsigned NOT NULL DEFAULT '0',
+  `RewardChoiceItemDisplayID2` int(10) unsigned NOT NULL DEFAULT '0',
+  `RewardChoiceItemID3` int(10) unsigned NOT NULL DEFAULT '0',
+  `RewardChoiceItemQuantity3` int(10) unsigned NOT NULL DEFAULT '0',
+  `RewardChoiceItemDisplayID3` int(10) unsigned NOT NULL DEFAULT '0',
+  `RewardChoiceItemID4` int(10) unsigned NOT NULL DEFAULT '0',
+  `RewardChoiceItemQuantity4` int(10) unsigned NOT NULL DEFAULT '0',
+  `RewardChoiceItemDisplayID4` int(10) unsigned NOT NULL DEFAULT '0',
+  `RewardChoiceItemID5` int(10) unsigned NOT NULL DEFAULT '0',
+  `RewardChoiceItemQuantity5` int(10) unsigned NOT NULL DEFAULT '0',
+  `RewardChoiceItemDisplayID5` int(10) unsigned NOT NULL DEFAULT '0',
+  `RewardChoiceItemID6` int(10) unsigned NOT NULL DEFAULT '0',
+  `RewardChoiceItemQuantity6` int(10) unsigned NOT NULL DEFAULT '0',
+  `RewardChoiceItemDisplayID6` int(10) unsigned NOT NULL DEFAULT '0',
+  `POIContinent` int(10) unsigned NOT NULL DEFAULT '0',
+  `POIx` float NOT NULL DEFAULT '0',
+  `POIy` float NOT NULL DEFAULT '0',
+  `POIPriority` int(11) NOT NULL DEFAULT '0',
+  `RewardTitle` int(10) unsigned NOT NULL DEFAULT '0',
+  `RewardTalents` int(10) unsigned NOT NULL DEFAULT '0',
+  `RewardArenaPoints` int(10) unsigned NOT NULL DEFAULT '0',
+  `RewardSkillLineID` int(10) unsigned NOT NULL DEFAULT '0',
+  `RewardNumSkillUps` int(10) unsigned NOT NULL DEFAULT '0',
+  `PortraitGiver` int(10) unsigned NOT NULL DEFAULT '0',
+  `PortraitTurnIn` int(10) unsigned NOT NULL DEFAULT '0',
+  `RewardFactionID1` int(10) unsigned NOT NULL DEFAULT '0',
+  `RewardFactionValue1` int(11) NOT NULL DEFAULT '0',
+  `RewardFactionOverride1` int(11) NOT NULL DEFAULT '0',
+  `RewardFactionID2` int(10) unsigned NOT NULL DEFAULT '0',
+  `RewardFactionValue2` int(11) NOT NULL DEFAULT '0',
+  `RewardFactionOverride2` int(11) NOT NULL DEFAULT '0',
+  `RewardFactionID3` int(10) unsigned NOT NULL DEFAULT '0',
+  `RewardFactionValue3` int(11) NOT NULL DEFAULT '0',
+  `RewardFactionOverride3` int(11) NOT NULL DEFAULT '0',
+  `RewardFactionID4` int(10) unsigned NOT NULL DEFAULT '0',
+  `RewardFactionValue4` int(11) NOT NULL DEFAULT '0',
+  `RewardFactionOverride4` int(11) NOT NULL DEFAULT '0',
+  `RewardFactionID5` int(10) unsigned NOT NULL DEFAULT '0',
+  `RewardFactionValue5` int(11) NOT NULL DEFAULT '0',
+  `RewardFactionOverride5` int(11) NOT NULL DEFAULT '0',
+  `RewardFactionFlags` int(10) unsigned NOT NULL DEFAULT '0',
+  `RewardCurrencyID1` int(10) unsigned NOT NULL DEFAULT '0',
+  `RewardCurrencyQty1` int(10) unsigned NOT NULL DEFAULT '0',
+  `RewardCurrencyID2` int(10) unsigned NOT NULL DEFAULT '0',
+  `RewardCurrencyQty2` int(10) unsigned NOT NULL DEFAULT '0',
+  `RewardCurrencyID3` int(10) unsigned NOT NULL DEFAULT '0',
+  `RewardCurrencyQty3` int(10) unsigned NOT NULL DEFAULT '0',
+  `RewardCurrencyID4` int(10) unsigned NOT NULL DEFAULT '0',
+  `RewardCurrencyQty4` int(10) unsigned NOT NULL DEFAULT '0',
+  `AcceptedSoundKitID` int(10) unsigned NOT NULL DEFAULT '0',
+  `CompleteSoundKitID` int(10) unsigned NOT NULL DEFAULT '0',
+  `AreaGroupID` int(10) unsigned NOT NULL DEFAULT '0',
+  `TimeAllowed` int(10) unsigned NOT NULL DEFAULT '0',
+  `AllowableRaces` int(11) NOT NULL DEFAULT '-1',
+  `LogTitle` text,
+  `LogDescription` text,
+  `QuestDescription` text,
+  `AreaDescription` text,
+  `PortraitGiverText` text,
+  `PortraitGiverName` text,
+  `PortraitTurnInText` text,
+  `PortraitTurnInName` text,
+  `QuestCompletionLog` text,
+  `VerifiedBuild` smallint(5) DEFAULT '0',
+  PRIMARY KEY (`ID`)
+) ENGINE=MyISAM DEFAULT CHARSET=utf8 COMMENT='Quest System';
+/*!40101 SET character_set_client = @saved_cs_client */;
+
+--
+-- Table structure for table `quest_template_addon`
+--
+
+DROP TABLE IF EXISTS `quest_template_addon`;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `quest_template_addon` (
+  `ID` mediumint(8) unsigned NOT NULL DEFAULT '0',
+  `MaxLevel` tinyint(3) unsigned NOT NULL DEFAULT '0',
+  `AllowableClasses` int(10) unsigned NOT NULL DEFAULT '0',
+  `SourceSpellID` mediumint(8) unsigned NOT NULL DEFAULT '0',
+  `PrevQuestID` mediumint(8) NOT NULL DEFAULT '0',
+  `NextQuestID` mediumint(8) NOT NULL DEFAULT '0',
+  `ExclusiveGroup` mediumint(8) NOT NULL DEFAULT '0',
+  `RewardMailTemplateID` mediumint(8) unsigned NOT NULL DEFAULT '0',
+  `RewardMailDelay` int(10) unsigned NOT NULL DEFAULT '0',
+  `RequiredSkillID` smallint(5) unsigned NOT NULL DEFAULT '0',
   `RequiredSkillPoints` smallint(5) unsigned NOT NULL DEFAULT '0',
-  `RequiredFactionId1` smallint(5) unsigned NOT NULL DEFAULT '0',
-  `RequiredFactionId2` smallint(5) unsigned NOT NULL DEFAULT '0',
-  `RequiredFactionValue1` mediumint(8) NOT NULL DEFAULT '0',
-  `RequiredFactionValue2` mediumint(8) NOT NULL DEFAULT '0',
   `RequiredMinRepFaction` smallint(5) unsigned NOT NULL DEFAULT '0',
   `RequiredMaxRepFaction` smallint(5) unsigned NOT NULL DEFAULT '0',
   `RequiredMinRepValue` mediumint(8) NOT NULL DEFAULT '0',
   `RequiredMaxRepValue` mediumint(8) NOT NULL DEFAULT '0',
-  `PrevQuestId` mediumint(8) NOT NULL DEFAULT '0',
-  `NextQuestId` mediumint(8) NOT NULL DEFAULT '0',
-  `ExclusiveGroup` mediumint(8) NOT NULL DEFAULT '0',
-  `NextQuestIdChain` mediumint(8) unsigned NOT NULL DEFAULT '0',
-  `RewardXPId` tinyint(3) unsigned NOT NULL DEFAULT '0',
-  `RewardOrRequiredMoney` int(11) NOT NULL DEFAULT '0',
-  `RewardMoneyMaxLevel` int(10) unsigned NOT NULL DEFAULT '0',
-  `RewardSpell` mediumint(8) unsigned NOT NULL DEFAULT '0',
-  `RewardSpellCast` int(11) NOT NULL DEFAULT '0',
-  `RewardHonor` int(11) NOT NULL DEFAULT '0',
-  `RewardHonorMultiplier` float NOT NULL DEFAULT '1',
-  `RewardMailTemplateId` mediumint(8) unsigned NOT NULL DEFAULT '0',
-  `RewardMailDelay` int(11) unsigned NOT NULL DEFAULT '0',
-  `SourceItemId` mediumint(8) unsigned NOT NULL DEFAULT '0',
-  `SourceItemCount` tinyint(3) unsigned NOT NULL DEFAULT '0',
-  `SourceSpellId` mediumint(8) unsigned NOT NULL DEFAULT '0',
-  `Flags` int(10) unsigned NOT NULL DEFAULT '0',
+  `ProvidedItemCount` tinyint(3) unsigned NOT NULL DEFAULT '0',
   `SpecialFlags` tinyint(3) unsigned NOT NULL DEFAULT '0',
-  `MinimapTargetMark` tinyint(3) unsigned NOT NULL DEFAULT '0',
-  `RewardTitleId` tinyint(3) unsigned NOT NULL DEFAULT '0',
-  `RequiredPlayerKills` tinyint(3) unsigned NOT NULL DEFAULT '0',
-  `RewardTalents` tinyint(3) unsigned NOT NULL DEFAULT '0',
-  `RewardArenaPoints` smallint(5) unsigned NOT NULL DEFAULT '0',
-  `RewardSkillId` smallint(5) unsigned NOT NULL DEFAULT '0',
-  `RewardSkillPoints` tinyint(3) unsigned NOT NULL DEFAULT '0',
-  `RewardReputationMask` tinyint(3) unsigned NOT NULL DEFAULT '0',
-  `QuestGiverPortrait` mediumint(8) unsigned NOT NULL DEFAULT '0',
-  `QuestTurnInPortrait` mediumint(8) unsigned NOT NULL DEFAULT '0',
-  `RewardItemId1` mediumint(8) unsigned NOT NULL DEFAULT '0',
-  `RewardItemId2` mediumint(8) unsigned NOT NULL DEFAULT '0',
-  `RewardItemId3` mediumint(8) unsigned NOT NULL DEFAULT '0',
-  `RewardItemId4` mediumint(8) unsigned NOT NULL DEFAULT '0',
-  `RewardItemCount1` smallint(5) unsigned NOT NULL DEFAULT '0',
-  `RewardItemCount2` smallint(5) unsigned NOT NULL DEFAULT '0',
-  `RewardItemCount3` smallint(5) unsigned NOT NULL DEFAULT '0',
-  `RewardItemCount4` smallint(5) unsigned NOT NULL DEFAULT '0',
-  `RewardChoiceItemId1` mediumint(8) unsigned NOT NULL DEFAULT '0',
-  `RewardChoiceItemId2` mediumint(8) unsigned NOT NULL DEFAULT '0',
-  `RewardChoiceItemId3` mediumint(8) unsigned NOT NULL DEFAULT '0',
-  `RewardChoiceItemId4` mediumint(8) unsigned NOT NULL DEFAULT '0',
-  `RewardChoiceItemId5` mediumint(8) unsigned NOT NULL DEFAULT '0',
-  `RewardChoiceItemId6` mediumint(8) unsigned NOT NULL DEFAULT '0',
-  `RewardChoiceItemCount1` smallint(5) unsigned NOT NULL DEFAULT '0',
-  `RewardChoiceItemCount2` smallint(5) unsigned NOT NULL DEFAULT '0',
-  `RewardChoiceItemCount3` smallint(5) unsigned NOT NULL DEFAULT '0',
-  `RewardChoiceItemCount4` smallint(5) unsigned NOT NULL DEFAULT '0',
-  `RewardChoiceItemCount5` smallint(5) unsigned NOT NULL DEFAULT '0',
-  `RewardChoiceItemCount6` smallint(5) unsigned NOT NULL DEFAULT '0',
-  `RewardFactionId1` smallint(5) unsigned NOT NULL DEFAULT '0' COMMENT 'faction id from Faction.dbc in this case',
-  `RewardFactionId2` smallint(5) unsigned NOT NULL DEFAULT '0' COMMENT 'faction id from Faction.dbc in this case',
-  `RewardFactionId3` smallint(5) unsigned NOT NULL DEFAULT '0' COMMENT 'faction id from Faction.dbc in this case',
-  `RewardFactionId4` smallint(5) unsigned NOT NULL DEFAULT '0' COMMENT 'faction id from Faction.dbc in this case',
-  `RewardFactionId5` smallint(5) unsigned NOT NULL DEFAULT '0' COMMENT 'faction id from Faction.dbc in this case',
-  `RewardFactionValueId1` mediumint(8) NOT NULL DEFAULT '0',
-  `RewardFactionValueId2` mediumint(8) NOT NULL DEFAULT '0',
-  `RewardFactionValueId3` mediumint(8) NOT NULL DEFAULT '0',
-  `RewardFactionValueId4` mediumint(8) NOT NULL DEFAULT '0',
-  `RewardFactionValueId5` mediumint(8) NOT NULL DEFAULT '0',
-  `RewardFactionValueIdOverride1` int(11) NOT NULL DEFAULT '0',
-  `RewardFactionValueIdOverride2` int(11) NOT NULL DEFAULT '0',
-  `RewardFactionValueIdOverride3` int(11) NOT NULL DEFAULT '0',
-  `RewardFactionValueIdOverride4` int(11) NOT NULL DEFAULT '0',
-  `RewardFactionValueIdOverride5` int(11) NOT NULL DEFAULT '0',
-  `PointMapId` smallint(5) unsigned NOT NULL DEFAULT '0',
-  `PointX` float NOT NULL DEFAULT '0',
-  `PointY` float NOT NULL DEFAULT '0',
-  `PointOption` mediumint(8) unsigned NOT NULL DEFAULT '0',
-  `Title` text,
-  `Objectives` text,
-  `Details` text,
-  `EndText` text,
-  `OfferRewardText` text,
-  `RequestItemsText` text,
-  `CompletedText` text,
-  `RequiredNpcOrGo1` mediumint(8) NOT NULL DEFAULT '0',
-  `RequiredNpcOrGo2` mediumint(8) NOT NULL DEFAULT '0',
-  `RequiredNpcOrGo3` mediumint(8) NOT NULL DEFAULT '0',
-  `RequiredNpcOrGo4` mediumint(8) NOT NULL DEFAULT '0',
-  `RequiredNpcOrGoCount1` smallint(5) unsigned NOT NULL DEFAULT '0',
-  `RequiredNpcOrGoCount2` smallint(5) unsigned NOT NULL DEFAULT '0',
-  `RequiredNpcOrGoCount3` smallint(5) unsigned NOT NULL DEFAULT '0',
-  `RequiredNpcOrGoCount4` smallint(5) unsigned NOT NULL DEFAULT '0',
-  `RequiredSourceItemId1` mediumint(8) unsigned NOT NULL DEFAULT '0',
-  `RequiredSourceItemId2` mediumint(8) unsigned NOT NULL DEFAULT '0',
-  `RequiredSourceItemId3` mediumint(8) unsigned NOT NULL DEFAULT '0',
-  `RequiredSourceItemId4` mediumint(8) unsigned NOT NULL DEFAULT '0',
-  `RequiredSourceItemCount1` smallint(5) unsigned NOT NULL DEFAULT '0',
-  `RequiredSourceItemCount2` smallint(5) unsigned NOT NULL DEFAULT '0',
-  `RequiredSourceItemCount3` smallint(5) unsigned NOT NULL DEFAULT '0',
-  `RequiredSourceItemCount4` smallint(5) unsigned NOT NULL DEFAULT '0',
-  `RequiredItemId1` mediumint(8) unsigned NOT NULL DEFAULT '0',
-  `RequiredItemId2` mediumint(8) unsigned NOT NULL DEFAULT '0',
-  `RequiredItemId3` mediumint(8) unsigned NOT NULL DEFAULT '0',
-  `RequiredItemId4` mediumint(8) unsigned NOT NULL DEFAULT '0',
-  `RequiredItemId5` mediumint(8) unsigned NOT NULL DEFAULT '0',
-  `RequiredItemId6` mediumint(8) unsigned NOT NULL DEFAULT '0',
-  `RequiredItemCount1` smallint(5) unsigned NOT NULL DEFAULT '0',
-  `RequiredItemCount2` smallint(5) unsigned NOT NULL DEFAULT '0',
-  `RequiredItemCount3` smallint(5) unsigned NOT NULL DEFAULT '0',
-  `RequiredItemCount4` smallint(5) unsigned NOT NULL DEFAULT '0',
-  `RequiredItemCount5` smallint(5) unsigned NOT NULL DEFAULT '0',
-  `RequiredItemCount6` smallint(5) unsigned NOT NULL DEFAULT '0',
-  `RequiredSpell` mediumint(8) unsigned NOT NULL DEFAULT '0',
-  `ObjectiveText1` text,
-  `ObjectiveText2` text,
-  `ObjectiveText3` text,
-  `ObjectiveText4` text,
-  `RewardCurrencyId1` smallint(5) unsigned NOT NULL DEFAULT '0',
-  `RewardCurrencyId2` smallint(5) unsigned NOT NULL DEFAULT '0',
-  `RewardCurrencyId3` smallint(5) unsigned NOT NULL DEFAULT '0',
-  `RewardCurrencyId4` smallint(5) unsigned NOT NULL DEFAULT '0',
-  `RewardCurrencyCount1` tinyint(3) unsigned NOT NULL DEFAULT '0',
-  `RewardCurrencyCount2` tinyint(3) unsigned NOT NULL DEFAULT '0',
-  `RewardCurrencyCount3` tinyint(3) unsigned NOT NULL DEFAULT '0',
-  `RewardCurrencyCount4` tinyint(3) unsigned NOT NULL DEFAULT '0',
-  `RequiredCurrencyId1` smallint(5) unsigned NOT NULL DEFAULT '0',
-  `RequiredCurrencyId2` smallint(5) unsigned NOT NULL DEFAULT '0',
-  `RequiredCurrencyId3` smallint(5) unsigned NOT NULL DEFAULT '0',
-  `RequiredCurrencyId4` smallint(5) unsigned NOT NULL DEFAULT '0',
-  `RequiredCurrencyCount1` tinyint(3) unsigned NOT NULL DEFAULT '0',
-  `RequiredCurrencyCount2` tinyint(3) unsigned NOT NULL DEFAULT '0',
-  `RequiredCurrencyCount3` tinyint(3) unsigned NOT NULL DEFAULT '0',
-  `RequiredCurrencyCount4` tinyint(3) unsigned NOT NULL DEFAULT '0',
-  `QuestGiverTextWindow` text,
-  `QuestGiverTargetName` text,
-  `QuestTurnTextWindow` text,
-  `QuestTurnTargetName` text,
-  `SoundAccept` smallint(5) unsigned NOT NULL DEFAULT '890',
-  `SoundTurnIn` smallint(5) unsigned NOT NULL DEFAULT '878',
-  `DetailsEmote1` smallint(5) unsigned NOT NULL DEFAULT '0',
-  `DetailsEmote2` smallint(5) unsigned NOT NULL DEFAULT '0',
-  `DetailsEmote3` smallint(5) unsigned NOT NULL DEFAULT '0',
-  `DetailsEmote4` smallint(5) unsigned NOT NULL DEFAULT '0',
-  `DetailsEmoteDelay1` int(10) unsigned NOT NULL DEFAULT '0',
-  `DetailsEmoteDelay2` int(10) unsigned NOT NULL DEFAULT '0',
-  `DetailsEmoteDelay3` int(10) unsigned NOT NULL DEFAULT '0',
-  `DetailsEmoteDelay4` int(10) unsigned NOT NULL DEFAULT '0',
-  `EmoteOnIncomplete` smallint(5) unsigned NOT NULL DEFAULT '0',
-  `EmoteOnComplete` smallint(5) unsigned NOT NULL DEFAULT '0',
-  `OfferRewardEmote1` smallint(5) unsigned NOT NULL DEFAULT '0',
-  `OfferRewardEmote2` smallint(5) unsigned NOT NULL DEFAULT '0',
-  `OfferRewardEmote3` smallint(5) unsigned NOT NULL DEFAULT '0',
-  `OfferRewardEmote4` smallint(5) unsigned NOT NULL DEFAULT '0',
-  `OfferRewardEmoteDelay1` int(10) unsigned NOT NULL DEFAULT '0',
-  `OfferRewardEmoteDelay2` int(10) unsigned NOT NULL DEFAULT '0',
-  `OfferRewardEmoteDelay3` int(10) unsigned NOT NULL DEFAULT '0',
-  `OfferRewardEmoteDelay4` int(10) unsigned NOT NULL DEFAULT '0',
-  `VerifiedBuild` smallint(5) DEFAULT '0',
-  PRIMARY KEY (`Id`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COMMENT='Quest System';
+  PRIMARY KEY (`ID`)
+) ENGINE=MyISAM DEFAULT CHARSET=utf8;
+/*!40101 SET character_set_client = @saved_cs_client */;
+
+--
+-- Table structure for table `quest_visual_effect`
+--
+
+DROP TABLE IF EXISTS `quest_visual_effect`;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `quest_visual_effect` (
+  `ID` mediumint(8) unsigned NOT NULL DEFAULT '0',
+  `Index` tinyint(3) unsigned NOT NULL DEFAULT '0',
+  `VisualEffect` mediumint(8) NOT NULL DEFAULT '0',
+  `VerifiedBuild` smallint(5) NOT NULL DEFAULT '0',
+  PRIMARY KEY (`ID`,`Index`)
+) ENGINE=MyISAM DEFAULT CHARSET=utf8;
+/*!40101 SET character_set_client = @saved_cs_client */;
+
+--
+-- Table structure for table `race_expansion_requirement`
+--
+
+DROP TABLE IF EXISTS `race_expansion_requirement`;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `race_expansion_requirement` (
+  `raceID` tinyint(3) unsigned NOT NULL DEFAULT '0',
+  `expansion` tinyint(3) unsigned NOT NULL DEFAULT '0',
+  PRIMARY KEY (`raceID`)
+) ENGINE=MyISAM DEFAULT CHARSET=utf8;
 /*!40101 SET character_set_client = @saved_cs_client */;
 
 --
@@ -3232,7 +3011,7 @@ DROP TABLE IF EXISTS `smart_scripts`;
 /*!40101 SET @saved_cs_client     = @@character_set_client */;
 /*!40101 SET character_set_client = utf8 */;
 CREATE TABLE `smart_scripts` (
-  `entryorguid` int(11) NOT NULL,
+  `entryorguid` bigint(20) NOT NULL DEFAULT '0',
   `source_type` tinyint(3) unsigned NOT NULL DEFAULT '0',
   `id` smallint(5) unsigned NOT NULL DEFAULT '0',
   `link` smallint(5) unsigned NOT NULL DEFAULT '0',
@@ -3287,24 +3066,6 @@ CREATE TABLE `spell_area` (
 /*!40101 SET character_set_client = @saved_cs_client */;
 
 --
--- Table structure for table `spell_bonus_data`
---
-
-DROP TABLE IF EXISTS `spell_bonus_data`;
-/*!40101 SET @saved_cs_client     = @@character_set_client */;
-/*!40101 SET character_set_client = utf8 */;
-CREATE TABLE `spell_bonus_data` (
-  `entry` mediumint(8) unsigned NOT NULL DEFAULT '0',
-  `direct_bonus` float NOT NULL DEFAULT '0',
-  `dot_bonus` float NOT NULL DEFAULT '0',
-  `ap_bonus` float NOT NULL DEFAULT '0',
-  `ap_dot_bonus` float NOT NULL DEFAULT '0',
-  `comments` varchar(255) DEFAULT NULL,
-  PRIMARY KEY (`entry`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8;
-/*!40101 SET character_set_client = @saved_cs_client */;
-
---
 -- Table structure for table `spell_custom_attr`
 --
 
@@ -3482,6 +3243,7 @@ CREATE TABLE `spell_proc` (
   `spellFamilyMask0` int(10) unsigned NOT NULL DEFAULT '0',
   `spellFamilyMask1` int(10) unsigned NOT NULL DEFAULT '0',
   `spellFamilyMask2` int(10) unsigned NOT NULL DEFAULT '0',
+  `spellFamilyMask3` int(10) unsigned NOT NULL DEFAULT '0',
   `typeMask` int(10) unsigned NOT NULL DEFAULT '0',
   `spellTypeMask` int(10) unsigned NOT NULL DEFAULT '0',
   `spellPhaseMask` int(11) NOT NULL DEFAULT '0',
@@ -3509,6 +3271,7 @@ CREATE TABLE `spell_proc_event` (
   `SpellFamilyMask0` int(10) unsigned NOT NULL DEFAULT '0',
   `SpellFamilyMask1` int(10) unsigned NOT NULL DEFAULT '0',
   `SpellFamilyMask2` int(10) unsigned NOT NULL DEFAULT '0',
+  `spellFamilyMask3` int(10) unsigned NOT NULL DEFAULT '0',
   `procFlags` int(10) unsigned NOT NULL DEFAULT '0',
   `procEx` int(10) unsigned NOT NULL DEFAULT '0',
   `ppmRate` float NOT NULL DEFAULT '0',
@@ -3592,15 +3355,14 @@ DROP TABLE IF EXISTS `spell_target_position`;
 /*!40101 SET @saved_cs_client     = @@character_set_client */;
 /*!40101 SET character_set_client = utf8 */;
 CREATE TABLE `spell_target_position` (
-  `id` mediumint(8) unsigned NOT NULL DEFAULT '0' COMMENT 'Identifier',
-  `effIndex` tinyint(3) unsigned NOT NULL DEFAULT '0',
-  `target_map` smallint(5) unsigned NOT NULL DEFAULT '0',
-  `target_position_x` float NOT NULL DEFAULT '0',
-  `target_position_y` float NOT NULL DEFAULT '0',
-  `target_position_z` float NOT NULL DEFAULT '0',
-  `target_orientation` float NOT NULL DEFAULT '0',
+  `ID` mediumint(8) unsigned NOT NULL DEFAULT '0',
+  `EffectIndex` tinyint(3) unsigned NOT NULL DEFAULT '0',
+  `MapID` smallint(3) unsigned NOT NULL DEFAULT '0',
+  `PositionX` float NOT NULL DEFAULT '0',
+  `PositionY` float NOT NULL DEFAULT '0',
+  `PositionZ` float NOT NULL DEFAULT '0',
   `VerifiedBuild` smallint(5) DEFAULT '0',
-  PRIMARY KEY (`id`,`effIndex`)
+  PRIMARY KEY (`ID`,`EffectIndex`)
 ) ENGINE=MyISAM DEFAULT CHARSET=utf8 ROW_FORMAT=FIXED COMMENT='Spell System';
 /*!40101 SET character_set_client = @saved_cs_client */;
 
@@ -3621,23 +3383,6 @@ CREATE TABLE `spell_threat` (
 /*!40101 SET character_set_client = @saved_cs_client */;
 
 --
--- Table structure for table `spelldifficulty_dbc`
---
-
-DROP TABLE IF EXISTS `spelldifficulty_dbc`;
-/*!40101 SET @saved_cs_client     = @@character_set_client */;
-/*!40101 SET character_set_client = utf8 */;
-CREATE TABLE `spelldifficulty_dbc` (
-  `id` int(11) unsigned NOT NULL DEFAULT '0',
-  `spellid0` int(11) unsigned NOT NULL DEFAULT '0',
-  `spellid1` int(11) unsigned NOT NULL DEFAULT '0',
-  `spellid2` int(11) unsigned NOT NULL DEFAULT '0',
-  `spellid3` int(11) unsigned NOT NULL DEFAULT '0',
-  PRIMARY KEY (`id`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8;
-/*!40101 SET character_set_client = @saved_cs_client */;
-
---
 -- Table structure for table `spelleffect_dbc`
 --
 
@@ -3682,7 +3427,7 @@ DROP TABLE IF EXISTS `transports`;
 /*!40101 SET @saved_cs_client     = @@character_set_client */;
 /*!40101 SET character_set_client = utf8 */;
 CREATE TABLE `transports` (
-  `guid` int(10) unsigned NOT NULL AUTO_INCREMENT,
+  `guid` bigint(20) unsigned NOT NULL DEFAULT '0',
   `entry` mediumint(8) unsigned NOT NULL DEFAULT '0',
   `name` text,
   `phaseid` int(10) NOT NULL DEFAULT '0',
@@ -3716,6 +3461,37 @@ CREATE TABLE `trinity_string` (
 /*!40101 SET character_set_client = @saved_cs_client */;
 
 --
+-- Table structure for table `updates`
+--
+
+DROP TABLE IF EXISTS `updates`;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `updates` (
+  `name` varchar(200) NOT NULL COMMENT 'filename with extension of the update.',
+  `hash` char(40) DEFAULT '' COMMENT 'sha1 hash of the sql file.',
+  `state` enum('RELEASED','ARCHIVED') NOT NULL DEFAULT 'RELEASED' COMMENT 'defines if an update is released or archived.',
+  `timestamp` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT 'timestamp when the query was applied.',
+  `speed` int(10) unsigned NOT NULL DEFAULT '0' COMMENT 'time the query takes to apply in ms.',
+  PRIMARY KEY (`name`)
+) ENGINE=MyISAM DEFAULT CHARSET=utf8 COMMENT='List of all applied updates in this database.';
+/*!40101 SET character_set_client = @saved_cs_client */;
+
+--
+-- Table structure for table `updates_include`
+--
+
+DROP TABLE IF EXISTS `updates_include`;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `updates_include` (
+  `path` varchar(200) NOT NULL COMMENT 'directory to include. $ means relative to the source directory.',
+  `state` enum('RELEASED','ARCHIVED') NOT NULL DEFAULT 'RELEASED' COMMENT 'defines if the directory contains released or archived updates.',
+  PRIMARY KEY (`path`)
+) ENGINE=MyISAM DEFAULT CHARSET=utf8 COMMENT='List of directories where we want to include sql updates.';
+/*!40101 SET character_set_client = @saved_cs_client */;
+
+--
 -- Table structure for table `vehicle_accessory`
 --
 
@@ -3723,7 +3499,7 @@ DROP TABLE IF EXISTS `vehicle_accessory`;
 /*!40101 SET @saved_cs_client     = @@character_set_client */;
 /*!40101 SET character_set_client = utf8 */;
 CREATE TABLE `vehicle_accessory` (
-  `guid` mediumint(8) unsigned NOT NULL DEFAULT '0',
+  `guid` bigint(20) unsigned NOT NULL DEFAULT '0',
   `accessory_entry` mediumint(8) unsigned NOT NULL DEFAULT '0',
   `seat_id` tinyint(4) NOT NULL DEFAULT '0',
   `minion` tinyint(3) unsigned NOT NULL DEFAULT '0',
@@ -3769,8 +3545,6 @@ CREATE TABLE `version` (
 ) ENGINE=MyISAM DEFAULT CHARSET=utf8 ROW_FORMAT=FIXED COMMENT='Version Notes';
 /*!40101 SET character_set_client = @saved_cs_client */;
 
-INSERT INTO `version` (`core_version`) VALUES ('');
-
 --
 -- Table structure for table `warden_checks`
 --
@@ -3809,7 +3583,7 @@ CREATE TABLE `waypoint_data` (
   `move_type` int(11) NOT NULL DEFAULT '0',
   `action` int(11) NOT NULL DEFAULT '0',
   `action_chance` smallint(6) NOT NULL DEFAULT '100',
-  `wpguid` int(11) NOT NULL DEFAULT '0',
+  `wpguid` bigint(20) unsigned NOT NULL DEFAULT '0',
   PRIMARY KEY (`id`,`point`)
 ) ENGINE=MyISAM DEFAULT CHARSET=utf8;
 /*!40101 SET character_set_client = @saved_cs_client */;
@@ -3864,4 +3638,4 @@ CREATE TABLE `waypoints` (
 /*!40101 SET COLLATION_CONNECTION=@OLD_COLLATION_CONNECTION */;
 /*!40111 SET SQL_NOTES=@OLD_SQL_NOTES */;
 
--- Dump completed on 2014-10-27 23:26:07
+-- Dump completed on 2015-03-21 16:07:24
diff --git a/sql/base/hotfixes_database.sql b/sql/base/hotfixes_database.sql
deleted file mode 100644
index 61ec102c295..00000000000
--- a/sql/base/hotfixes_database.sql
+++ /dev/null
@@ -1,56 +0,0 @@
--- MySQL dump 10.13  Distrib 5.6.9-rc, for Win64 (x86_64)
---
--- Host: localhost    Database: hotfixes
--- ------------------------------------------------------
--- Server version	5.6.9-rc
-
-/*!40101 SET @OLD_CHARACTER_SET_CLIENT=@@CHARACTER_SET_CLIENT */;
-/*!40101 SET @OLD_CHARACTER_SET_RESULTS=@@CHARACTER_SET_RESULTS */;
-/*!40101 SET @OLD_COLLATION_CONNECTION=@@COLLATION_CONNECTION */;
-/*!40101 SET NAMES utf8 */;
-/*!40103 SET @OLD_TIME_ZONE=@@TIME_ZONE */;
-/*!40103 SET TIME_ZONE='+00:00' */;
-/*!40014 SET @OLD_UNIQUE_CHECKS=@@UNIQUE_CHECKS, UNIQUE_CHECKS=0 */;
-/*!40014 SET @OLD_FOREIGN_KEY_CHECKS=@@FOREIGN_KEY_CHECKS, FOREIGN_KEY_CHECKS=0 */;
-/*!40101 SET @OLD_SQL_MODE=@@SQL_MODE, SQL_MODE='NO_AUTO_VALUE_ON_ZERO' */;
-/*!40111 SET @OLD_SQL_NOTES=@@SQL_NOTES, SQL_NOTES=0 */;
-
--- Dump completed on 2014-10-19 23:50:46
-
--- Workaround for the update system
--- As long as no full hotfix db exists
-
--- Updates base tables
-DROP TABLE IF EXISTS `updates`;
-CREATE TABLE `updates` (
-    `name` VARCHAR(200) NOT NULL COMMENT 'filename with extension of the update.',
-    `hash` CHAR(40) NULL DEFAULT '' COMMENT 'sha1 hash of the sql file.',
-    `state` ENUM('RELEASED','ARCHIVED') NOT NULL DEFAULT 'RELEASED' COMMENT 'defines if an update is released or archived.',
-    `timestamp` TIMESTAMP NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT 'timestamp when the query was applied.',
-    `speed` INT(10) UNSIGNED NOT NULL DEFAULT 0 COMMENT 'time the query takes to apply in ms.',
-    PRIMARY KEY (`name`)
-)
-COMMENT='List of all applied updates in this database.'
-COLLATE='utf8_general_ci'
-ENGINE=MyISAM;
-
-DROP TABLE IF EXISTS `updates_include`;
-CREATE TABLE `updates_include` (
-    `path` VARCHAR(200) NOT NULL COMMENT 'directory to include. $ means relative to the source directory.',
-    `state` ENUM('RELEASED','ARCHIVED') NOT NULL DEFAULT 'RELEASED' COMMENT 'defines if the directory contains released or archived updates.',
-    PRIMARY KEY (`path`)
-)
-COMMENT='List of directories where we want to include sql updates.'
-COLLATE='utf8_general_ci'
-ENGINE=MyISAM;
-
--- Hotfixes database update data
-TRUNCATE TABLE `updates_include`;
-INSERT INTO `updates_include` (`path`, `state`) VALUES
-('$/sql/updates/hotfixes', 'RELEASED'),
-('$/sql/custom/hotfixes', 'RELEASED'),
-('$/sql/old/6.x/hotfixes', 'ARCHIVED');
-
-INSERT IGNORE INTO `updates` (`name`, `hash`) VALUES
-('2015_03_20_00_hotfixes.sql', 'B761760804EA73BD297F296C5C1919687DF7191C'),
-('2015_03_20_01_hotfixes.sql', 'A79521F16AE82F0D7487495D0BF7A726D81F250D');
diff --git a/sql/updates/auth/2014_10_04_00_auth.sql b/sql/old/6.x/auth/00_2014_10_19/2014_10_04_00_auth.sql
index 61731b408b6..61731b408b6 100644
--- a/sql/updates/auth/2014_10_04_00_auth.sql
+++ b/sql/old/6.x/auth/00_2014_10_19/2014_10_04_00_auth.sql
diff --git a/sql/updates/auth/2014_10_19_00_auth.sql b/sql/old/6.x/auth/00_2014_10_19/2014_10_19_00_auth.sql
index a0a28f91359..a0a28f91359 100644
--- a/sql/updates/auth/2014_10_19_00_auth.sql
+++ b/sql/old/6.x/auth/00_2014_10_19/2014_10_19_00_auth.sql
diff --git a/sql/updates/auth/2014_10_26_00_auth.sql b/sql/old/6.x/auth/00_2014_10_19/2014_10_26_00_auth.sql
index db24968656e..db24968656e 100644
--- a/sql/updates/auth/2014_10_26_00_auth.sql
+++ b/sql/old/6.x/auth/00_2014_10_19/2014_10_26_00_auth.sql
diff --git a/sql/updates/auth/2014_11_03_00_auth.sql b/sql/old/6.x/auth/00_2014_10_19/2014_11_03_00_auth.sql
index 1e0f0835ed5..1e0f0835ed5 100644
--- a/sql/updates/auth/2014_11_03_00_auth.sql
+++ b/sql/old/6.x/auth/00_2014_10_19/2014_11_03_00_auth.sql
diff --git a/sql/updates/auth/2014_11_04_00_auth.sql b/sql/old/6.x/auth/00_2014_10_19/2014_11_04_00_auth.sql
index 5214034fd21..5214034fd21 100644
--- a/sql/updates/auth/2014_11_04_00_auth.sql
+++ b/sql/old/6.x/auth/00_2014_10_19/2014_11_04_00_auth.sql
diff --git a/sql/updates/auth/2014_11_09_00_auth.sql b/sql/old/6.x/auth/00_2014_10_19/2014_11_09_00_auth.sql
index 8cbe649b440..8cbe649b440 100644
--- a/sql/updates/auth/2014_11_09_00_auth.sql
+++ b/sql/old/6.x/auth/00_2014_10_19/2014_11_09_00_auth.sql
diff --git a/sql/updates/auth/2014_11_10_00_auth.sql b/sql/old/6.x/auth/00_2014_10_19/2014_11_10_00_auth.sql
index ce4d814f620..ce4d814f620 100644
--- a/sql/updates/auth/2014_11_10_00_auth.sql
+++ b/sql/old/6.x/auth/00_2014_10_19/2014_11_10_00_auth.sql
diff --git a/sql/updates/auth/2014_11_10_00_auth_from_335.sql b/sql/old/6.x/auth/00_2014_10_19/2014_11_10_00_auth_from_335.sql
index 088c5cc71b5..088c5cc71b5 100644
--- a/sql/updates/auth/2014_11_10_00_auth_from_335.sql
+++ b/sql/old/6.x/auth/00_2014_10_19/2014_11_10_00_auth_from_335.sql
diff --git a/sql/updates/auth/2014_11_10_01_auth.sql b/sql/old/6.x/auth/00_2014_10_19/2014_11_10_01_auth.sql
index 0f89140ecf4..0f89140ecf4 100644
--- a/sql/updates/auth/2014_11_10_01_auth.sql
+++ b/sql/old/6.x/auth/00_2014_10_19/2014_11_10_01_auth.sql
diff --git a/sql/updates/auth/2014_11_23_00_auth.sql b/sql/old/6.x/auth/00_2014_10_19/2014_11_23_00_auth.sql
index 1c68d6a8e06..1c68d6a8e06 100644
--- a/sql/updates/auth/2014_11_23_00_auth.sql
+++ b/sql/old/6.x/auth/00_2014_10_19/2014_11_23_00_auth.sql
diff --git a/sql/updates/auth/2014_11_25_00_auth.sql b/sql/old/6.x/auth/00_2014_10_19/2014_11_25_00_auth.sql
index 6594fe0c4fa..6594fe0c4fa 100644
--- a/sql/updates/auth/2014_11_25_00_auth.sql
+++ b/sql/old/6.x/auth/00_2014_10_19/2014_11_25_00_auth.sql
diff --git a/sql/updates/auth/2014_12_05_00_auth.sql b/sql/old/6.x/auth/00_2014_10_19/2014_12_05_00_auth.sql
index 95507c411f4..95507c411f4 100644
--- a/sql/updates/auth/2014_12_05_00_auth.sql
+++ b/sql/old/6.x/auth/00_2014_10_19/2014_12_05_00_auth.sql
diff --git a/sql/updates/auth/2014_12_10_00_auth.sql b/sql/old/6.x/auth/00_2014_10_19/2014_12_10_00_auth.sql
index 8068fd3c459..8068fd3c459 100644
--- a/sql/updates/auth/2014_12_10_00_auth.sql
+++ b/sql/old/6.x/auth/00_2014_10_19/2014_12_10_00_auth.sql
diff --git a/sql/updates/auth/2014_12_19_00_auth.sql b/sql/old/6.x/auth/00_2014_10_19/2014_12_19_00_auth.sql
index 1a975e766e5..1a975e766e5 100644
--- a/sql/updates/auth/2014_12_19_00_auth.sql
+++ b/sql/old/6.x/auth/00_2014_10_19/2014_12_19_00_auth.sql
diff --git a/sql/updates/auth/2014_12_20_00_auth.sql b/sql/old/6.x/auth/00_2014_10_19/2014_12_20_00_auth.sql
index d5e29712246..d5e29712246 100644
--- a/sql/updates/auth/2014_12_20_00_auth.sql
+++ b/sql/old/6.x/auth/00_2014_10_19/2014_12_20_00_auth.sql
diff --git a/sql/updates/auth/2014_12_25_00_auth.sql b/sql/old/6.x/auth/00_2014_10_19/2014_12_25_00_auth.sql
index 2ab5127e699..2ab5127e699 100644
--- a/sql/updates/auth/2014_12_25_00_auth.sql
+++ b/sql/old/6.x/auth/00_2014_10_19/2014_12_25_00_auth.sql
diff --git a/sql/updates/auth/2014_12_27_00_auth.sql b/sql/old/6.x/auth/00_2014_10_19/2014_12_27_00_auth.sql
index ddea3d335ff..ddea3d335ff 100644
--- a/sql/updates/auth/2014_12_27_00_auth.sql
+++ b/sql/old/6.x/auth/00_2014_10_19/2014_12_27_00_auth.sql
diff --git a/sql/updates/auth/2014_12_28_00_auth.sql b/sql/old/6.x/auth/00_2014_10_19/2014_12_28_00_auth.sql
index 4017474c6f7..4017474c6f7 100644
--- a/sql/updates/auth/2014_12_28_00_auth.sql
+++ b/sql/old/6.x/auth/00_2014_10_19/2014_12_28_00_auth.sql
diff --git a/sql/updates/auth/2015_02_22_00_auth.sql b/sql/old/6.x/auth/00_2014_10_19/2015_02_22_00_auth.sql
index dee634ba52e..dee634ba52e 100644
--- a/sql/updates/auth/2015_02_22_00_auth.sql
+++ b/sql/old/6.x/auth/00_2014_10_19/2015_02_22_00_auth.sql
diff --git a/sql/updates/auth/2015_03_01_00_auth.sql b/sql/old/6.x/auth/00_2014_10_19/2015_03_01_00_auth.sql
index 1f3fb944e0b..1f3fb944e0b 100644
--- a/sql/updates/auth/2015_03_01_00_auth.sql
+++ b/sql/old/6.x/auth/00_2014_10_19/2015_03_01_00_auth.sql
diff --git a/sql/updates/auth/2015_03_10_00_auth.sql b/sql/old/6.x/auth/00_2014_10_19/2015_03_10_00_auth.sql
index 3206edcbd8d..3206edcbd8d 100644
--- a/sql/updates/auth/2015_03_10_00_auth.sql
+++ b/sql/old/6.x/auth/00_2014_10_19/2015_03_10_00_auth.sql
diff --git a/sql/updates/auth/2015_03_20_00_auth.sql b/sql/old/6.x/auth/00_2014_10_19/2015_03_20_00_auth.sql
index 05c120274da..05c120274da 100644
--- a/sql/updates/auth/2015_03_20_00_auth.sql
+++ b/sql/old/6.x/auth/00_2014_10_19/2015_03_20_00_auth.sql
diff --git a/sql/updates/auth/2015_03_20_01_auth.sql b/sql/old/6.x/auth/00_2014_10_19/2015_03_20_01_auth.sql
index ecee16a2274..ecee16a2274 100644
--- a/sql/updates/auth/2015_03_20_01_auth.sql
+++ b/sql/old/6.x/auth/00_2014_10_19/2015_03_20_01_auth.sql
diff --git a/sql/updates/auth/2015_03_20_02_auth.sql b/sql/old/6.x/auth/00_2014_10_19/2015_03_20_02_auth.sql
index 12427489f01..12427489f01 100644
--- a/sql/updates/auth/2015_03_20_02_auth.sql
+++ b/sql/old/6.x/auth/00_2014_10_19/2015_03_20_02_auth.sql
diff --git a/sql/old/6.x/auth/CREATE_SUBDIRECTORIES_HERE b/sql/old/6.x/auth/CREATE_SUBDIRECTORIES_HERE
deleted file mode 100644
index e69de29bb2d..00000000000
--- a/sql/old/6.x/auth/CREATE_SUBDIRECTORIES_HERE
+++ /dev/null
diff --git a/sql/updates/characters/2014_10_20_00_characters.sql b/sql/old/6.x/characters/00_2014_10_19/2014_10_20_00_characters.sql
index 30c57bf5470..30c57bf5470 100644
--- a/sql/updates/characters/2014_10_20_00_characters.sql
+++ b/sql/old/6.x/characters/00_2014_10_19/2014_10_20_00_characters.sql
diff --git a/sql/updates/characters/2014_10_23_00_characters.sql b/sql/old/6.x/characters/00_2014_10_19/2014_10_23_00_characters.sql
index e6ee7048ac6..e6ee7048ac6 100644
--- a/sql/updates/characters/2014_10_23_00_characters.sql
+++ b/sql/old/6.x/characters/00_2014_10_19/2014_10_23_00_characters.sql
diff --git a/sql/updates/characters/2014_10_23_01_characters.sql b/sql/old/6.x/characters/00_2014_10_19/2014_10_23_01_characters.sql
index 88243131b5d..88243131b5d 100644
--- a/sql/updates/characters/2014_10_23_01_characters.sql
+++ b/sql/old/6.x/characters/00_2014_10_19/2014_10_23_01_characters.sql
diff --git a/sql/updates/characters/2014_10_23_02_characters.sql b/sql/old/6.x/characters/00_2014_10_19/2014_10_23_02_characters.sql
index 7861a548089..7861a548089 100644
--- a/sql/updates/characters/2014_10_23_02_characters.sql
+++ b/sql/old/6.x/characters/00_2014_10_19/2014_10_23_02_characters.sql
diff --git a/sql/updates/characters/2014_10_24_00_characters.sql b/sql/old/6.x/characters/00_2014_10_19/2014_10_24_00_characters.sql
index 099c699367c..099c699367c 100644
--- a/sql/updates/characters/2014_10_24_00_characters.sql
+++ b/sql/old/6.x/characters/00_2014_10_19/2014_10_24_00_characters.sql
diff --git a/sql/updates/characters/2014_10_25_00_characters.sql b/sql/old/6.x/characters/00_2014_10_19/2014_10_25_00_characters.sql
index 5dbd760c4f6..5dbd760c4f6 100644
--- a/sql/updates/characters/2014_10_25_00_characters.sql
+++ b/sql/old/6.x/characters/00_2014_10_19/2014_10_25_00_characters.sql
diff --git a/sql/updates/characters/2014_10_26_00_characters.sql b/sql/old/6.x/characters/00_2014_10_19/2014_10_26_00_characters.sql
index 7f180a364c3..7f180a364c3 100644
--- a/sql/updates/characters/2014_10_26_00_characters.sql
+++ b/sql/old/6.x/characters/00_2014_10_19/2014_10_26_00_characters.sql
diff --git a/sql/updates/characters/2014_11_12_00_characters.sql b/sql/old/6.x/characters/00_2014_10_19/2014_11_12_00_characters.sql
index 68aaf99d5d0..68aaf99d5d0 100644
--- a/sql/updates/characters/2014_11_12_00_characters.sql
+++ b/sql/old/6.x/characters/00_2014_10_19/2014_11_12_00_characters.sql
diff --git a/sql/updates/characters/2014_12_23_00_characters.sql b/sql/old/6.x/characters/00_2014_10_19/2014_12_23_00_characters.sql
index d72d71a3e7b..d72d71a3e7b 100644
--- a/sql/updates/characters/2014_12_23_00_characters.sql
+++ b/sql/old/6.x/characters/00_2014_10_19/2014_12_23_00_characters.sql
diff --git a/sql/updates/characters/2014_12_28_00_characters.sql b/sql/old/6.x/characters/00_2014_10_19/2014_12_28_00_characters.sql
index d6424d676b7..d6424d676b7 100644
--- a/sql/updates/characters/2014_12_28_00_characters.sql
+++ b/sql/old/6.x/characters/00_2014_10_19/2014_12_28_00_characters.sql
diff --git a/sql/updates/characters/2014_12_31_00_characters.sql b/sql/old/6.x/characters/00_2014_10_19/2014_12_31_00_characters.sql
index 2c7ec570d3d..2c7ec570d3d 100644
--- a/sql/updates/characters/2014_12_31_00_characters.sql
+++ b/sql/old/6.x/characters/00_2014_10_19/2014_12_31_00_characters.sql
diff --git a/sql/updates/characters/2015_01_02_00_characters.sql b/sql/old/6.x/characters/00_2014_10_19/2015_01_02_00_characters.sql
index 890bdd0eb11..890bdd0eb11 100644
--- a/sql/updates/characters/2015_01_02_00_characters.sql
+++ b/sql/old/6.x/characters/00_2014_10_19/2015_01_02_00_characters.sql
diff --git a/sql/updates/characters/2015_01_10_00_characters.sql b/sql/old/6.x/characters/00_2014_10_19/2015_01_10_00_characters.sql
index c0070507b6d..c0070507b6d 100644
--- a/sql/updates/characters/2015_01_10_00_characters.sql
+++ b/sql/old/6.x/characters/00_2014_10_19/2015_01_10_00_characters.sql
diff --git a/sql/updates/characters/2015_01_16_00_characters.sql b/sql/old/6.x/characters/00_2014_10_19/2015_01_16_00_characters.sql
index b3557fa1694..b3557fa1694 100644
--- a/sql/updates/characters/2015_01_16_00_characters.sql
+++ b/sql/old/6.x/characters/00_2014_10_19/2015_01_16_00_characters.sql
diff --git a/sql/updates/characters/2015_01_27_00_characters.sql b/sql/old/6.x/characters/00_2014_10_19/2015_01_27_00_characters.sql
index 3ccaa4defb0..3ccaa4defb0 100644
--- a/sql/updates/characters/2015_01_27_00_characters.sql
+++ b/sql/old/6.x/characters/00_2014_10_19/2015_01_27_00_characters.sql
diff --git a/sql/updates/characters/2015_02_13_00_characters.sql b/sql/old/6.x/characters/00_2014_10_19/2015_02_13_00_characters.sql
index 1ed83e4e762..1ed83e4e762 100644
--- a/sql/updates/characters/2015_02_13_00_characters.sql
+++ b/sql/old/6.x/characters/00_2014_10_19/2015_02_13_00_characters.sql
diff --git a/sql/updates/characters/2015_02_13_01_characters.sql b/sql/old/6.x/characters/00_2014_10_19/2015_02_13_01_characters.sql
index 52b7a7e4c2a..52b7a7e4c2a 100644
--- a/sql/updates/characters/2015_02_13_01_characters.sql
+++ b/sql/old/6.x/characters/00_2014_10_19/2015_02_13_01_characters.sql
diff --git a/sql/updates/characters/2015_02_17_00_characters.sql b/sql/old/6.x/characters/00_2014_10_19/2015_02_17_00_characters.sql
index ebf539c9a40..ebf539c9a40 100644
--- a/sql/updates/characters/2015_02_17_00_characters.sql
+++ b/sql/old/6.x/characters/00_2014_10_19/2015_02_17_00_characters.sql
diff --git a/sql/updates/characters/2015_03_10_00_characters.sql b/sql/old/6.x/characters/00_2014_10_19/2015_03_10_00_characters.sql
index ce55b3b35cc..ce55b3b35cc 100644
--- a/sql/updates/characters/2015_03_10_00_characters.sql
+++ b/sql/old/6.x/characters/00_2014_10_19/2015_03_10_00_characters.sql
diff --git a/sql/updates/characters/2015_03_20_00_characters.sql b/sql/old/6.x/characters/00_2014_10_19/2015_03_20_00_characters.sql
index 05c120274da..05c120274da 100644
--- a/sql/updates/characters/2015_03_20_00_characters.sql
+++ b/sql/old/6.x/characters/00_2014_10_19/2015_03_20_00_characters.sql
diff --git a/sql/updates/characters/2015_03_20_01_characters.sql b/sql/old/6.x/characters/00_2014_10_19/2015_03_20_01_characters.sql
index 69c8767e239..69c8767e239 100644
--- a/sql/updates/characters/2015_03_20_01_characters.sql
+++ b/sql/old/6.x/characters/00_2014_10_19/2015_03_20_01_characters.sql
diff --git a/sql/updates/characters/2015_03_20_02_characters.sql b/sql/old/6.x/characters/00_2014_10_19/2015_03_20_02_characters.sql
index 32f7ecffb26..32f7ecffb26 100644
--- a/sql/updates/characters/2015_03_20_02_characters.sql
+++ b/sql/old/6.x/characters/00_2014_10_19/2015_03_20_02_characters.sql
diff --git a/sql/old/6.x/characters/CREATE_SUBDIRECTORIES_HERE b/sql/old/6.x/characters/CREATE_SUBDIRECTORIES_HERE
deleted file mode 100644
index e69de29bb2d..00000000000
--- a/sql/old/6.x/characters/CREATE_SUBDIRECTORIES_HERE
+++ /dev/null
diff --git a/sql/updates/hotfixes/2014_10_19_01_hotfixes_area_poi.sql b/sql/old/6.x/hotfixes/00_2014_10_19/2014_10_19_01_hotfixes_area_poi.sql
index 5b5524ed882..5b5524ed882 100644
--- a/sql/updates/hotfixes/2014_10_19_01_hotfixes_area_poi.sql
+++ b/sql/old/6.x/hotfixes/00_2014_10_19/2014_10_19_01_hotfixes_area_poi.sql
diff --git a/sql/updates/hotfixes/2014_10_19_02_hotfixes_area_poi_state.sql b/sql/old/6.x/hotfixes/00_2014_10_19/2014_10_19_02_hotfixes_area_poi_state.sql
index 1d9708920ba..1d9708920ba 100644
--- a/sql/updates/hotfixes/2014_10_19_02_hotfixes_area_poi_state.sql
+++ b/sql/old/6.x/hotfixes/00_2014_10_19/2014_10_19_02_hotfixes_area_poi_state.sql
diff --git a/sql/updates/hotfixes/2014_10_19_03_hotfixes_creature_difficulty.sql b/sql/old/6.x/hotfixes/00_2014_10_19/2014_10_19_03_hotfixes_creature_difficulty.sql
index b71e3d80808..b71e3d80808 100644
--- a/sql/updates/hotfixes/2014_10_19_03_hotfixes_creature_difficulty.sql
+++ b/sql/old/6.x/hotfixes/00_2014_10_19/2014_10_19_03_hotfixes_creature_difficulty.sql
diff --git a/sql/updates/hotfixes/2014_10_19_04_hotfixes_creature.sql b/sql/old/6.x/hotfixes/00_2014_10_19/2014_10_19_04_hotfixes_creature.sql
index fe86a2c9842..fe86a2c9842 100644
--- a/sql/updates/hotfixes/2014_10_19_04_hotfixes_creature.sql
+++ b/sql/old/6.x/hotfixes/00_2014_10_19/2014_10_19_04_hotfixes_creature.sql
diff --git a/sql/updates/hotfixes/2014_10_19_05_hotfixes_broadcast_text.sql b/sql/old/6.x/hotfixes/00_2014_10_19/2014_10_19_05_hotfixes_broadcast_text.sql
index efedc418cd5..efedc418cd5 100644
--- a/sql/updates/hotfixes/2014_10_19_05_hotfixes_broadcast_text.sql
+++ b/sql/old/6.x/hotfixes/00_2014_10_19/2014_10_19_05_hotfixes_broadcast_text.sql
diff --git a/sql/updates/hotfixes/2014_10_19_06_hotfixes_broadcast_text.sql b/sql/old/6.x/hotfixes/00_2014_10_19/2014_10_19_06_hotfixes_broadcast_text.sql
index 2e0f0865910..2e0f0865910 100644
--- a/sql/updates/hotfixes/2014_10_19_06_hotfixes_broadcast_text.sql
+++ b/sql/old/6.x/hotfixes/00_2014_10_19/2014_10_19_06_hotfixes_broadcast_text.sql
diff --git a/sql/updates/hotfixes/2014_10_20_00_hotfixes_gameobjects.sql b/sql/old/6.x/hotfixes/00_2014_10_19/2014_10_20_00_hotfixes_gameobjects.sql
index adf6f9feb34..adf6f9feb34 100644
--- a/sql/updates/hotfixes/2014_10_20_00_hotfixes_gameobjects.sql
+++ b/sql/old/6.x/hotfixes/00_2014_10_19/2014_10_20_00_hotfixes_gameobjects.sql
diff --git a/sql/updates/hotfixes/2014_10_24_00_hotfixes_taxi_path_node.sql b/sql/old/6.x/hotfixes/00_2014_10_19/2014_10_24_00_hotfixes_taxi_path_node.sql
index c3cb7c74262..c3cb7c74262 100644
--- a/sql/updates/hotfixes/2014_10_24_00_hotfixes_taxi_path_node.sql
+++ b/sql/old/6.x/hotfixes/00_2014_10_19/2014_10_24_00_hotfixes_taxi_path_node.sql
diff --git a/sql/updates/hotfixes/2014_10_24_01_hotfixes_broadcast_text.sql b/sql/old/6.x/hotfixes/00_2014_10_19/2014_10_24_01_hotfixes_broadcast_text.sql
index b2a5cce56cb..b2a5cce56cb 100644
--- a/sql/updates/hotfixes/2014_10_24_01_hotfixes_broadcast_text.sql
+++ b/sql/old/6.x/hotfixes/00_2014_10_19/2014_10_24_01_hotfixes_broadcast_text.sql
diff --git a/sql/updates/hotfixes/2014_12_25_00_hotfixes_locale_broadcast_text.sql b/sql/old/6.x/hotfixes/00_2014_10_19/2014_12_25_00_hotfixes_locale_broadcast_text.sql
index 305525d84ab..305525d84ab 100644
--- a/sql/updates/hotfixes/2014_12_25_00_hotfixes_locale_broadcast_text.sql
+++ b/sql/old/6.x/hotfixes/00_2014_10_19/2014_12_25_00_hotfixes_locale_broadcast_text.sql
diff --git a/sql/updates/hotfixes/2014_12_26_00_hotfixes_hotfix_data.sql b/sql/old/6.x/hotfixes/00_2014_10_19/2014_12_26_00_hotfixes_hotfix_data.sql
index 9fc1a21ede3..9fc1a21ede3 100644
--- a/sql/updates/hotfixes/2014_12_26_00_hotfixes_hotfix_data.sql
+++ b/sql/old/6.x/hotfixes/00_2014_10_19/2014_12_26_00_hotfixes_hotfix_data.sql
diff --git a/sql/updates/hotfixes/2015_02_22_00_hotfixes.sql b/sql/old/6.x/hotfixes/00_2014_10_19/2015_02_22_00_hotfixes.sql
index f39dda765e2..f39dda765e2 100644
--- a/sql/updates/hotfixes/2015_02_22_00_hotfixes.sql
+++ b/sql/old/6.x/hotfixes/00_2014_10_19/2015_02_22_00_hotfixes.sql
diff --git a/sql/updates/hotfixes/2015_03_04_00_hotfixes.sql b/sql/old/6.x/hotfixes/00_2014_10_19/2015_03_04_00_hotfixes.sql
index cda2e375976..cda2e375976 100644
--- a/sql/updates/hotfixes/2015_03_04_00_hotfixes.sql
+++ b/sql/old/6.x/hotfixes/00_2014_10_19/2015_03_04_00_hotfixes.sql
diff --git a/sql/updates/hotfixes/2015_03_08_00_hotfixes.sql b/sql/old/6.x/hotfixes/00_2014_10_19/2015_03_08_00_hotfixes.sql
index 9f2f8516eb8..9f2f8516eb8 100644
--- a/sql/updates/hotfixes/2015_03_08_00_hotfixes.sql
+++ b/sql/old/6.x/hotfixes/00_2014_10_19/2015_03_08_00_hotfixes.sql
diff --git a/sql/updates/hotfixes/2015_03_20_00_hotfixes.sql b/sql/old/6.x/hotfixes/00_2014_10_19/2015_03_20_00_hotfixes.sql
index 05c120274da..05c120274da 100644
--- a/sql/updates/hotfixes/2015_03_20_00_hotfixes.sql
+++ b/sql/old/6.x/hotfixes/00_2014_10_19/2015_03_20_00_hotfixes.sql
diff --git a/sql/updates/hotfixes/2015_03_20_01_hotfixes.sql b/sql/old/6.x/hotfixes/00_2014_10_19/2015_03_20_01_hotfixes.sql
index a56bf038472..a56bf038472 100644
--- a/sql/updates/hotfixes/2015_03_20_01_hotfixes.sql
+++ b/sql/old/6.x/hotfixes/00_2014_10_19/2015_03_20_01_hotfixes.sql
diff --git a/sql/updates/hotfixes/2015_03_20_02_hotfixes.sql b/sql/old/6.x/hotfixes/00_2014_10_19/2015_03_20_02_hotfixes.sql
index 87b5da36aec..87b5da36aec 100644
--- a/sql/updates/hotfixes/2015_03_20_02_hotfixes.sql
+++ b/sql/old/6.x/hotfixes/00_2014_10_19/2015_03_20_02_hotfixes.sql
diff --git a/sql/old/6.x/hotfixes/CREATE_SUBDIRECTORIES_HERE b/sql/old/6.x/hotfixes/CREATE_SUBDIRECTORIES_HERE
deleted file mode 100644
index e69de29bb2d..00000000000
--- a/sql/old/6.x/hotfixes/CREATE_SUBDIRECTORIES_HERE
+++ /dev/null
diff --git a/sql/updates/world/2014_10_19_00_world.sql b/sql/old/6.x/world/00_2014_10_19/2014_10_19_00_world.sql
index 475427d7a13..475427d7a13 100644
--- a/sql/updates/world/2014_10_19_00_world.sql
+++ b/sql/old/6.x/world/00_2014_10_19/2014_10_19_00_world.sql
diff --git a/sql/updates/world/2014_10_19_01_world.sql b/sql/old/6.x/world/00_2014_10_19/2014_10_19_01_world.sql
index 99e7b4ee0c1..99e7b4ee0c1 100644
--- a/sql/updates/world/2014_10_19_01_world.sql
+++ b/sql/old/6.x/world/00_2014_10_19/2014_10_19_01_world.sql
diff --git a/sql/updates/world/2014_10_19_01_world_from_335.sql b/sql/old/6.x/world/00_2014_10_19/2014_10_19_01_world_from_335.sql
index b5048704717..b5048704717 100644
--- a/sql/updates/world/2014_10_19_01_world_from_335.sql
+++ b/sql/old/6.x/world/00_2014_10_19/2014_10_19_01_world_from_335.sql
diff --git a/sql/updates/world/2014_10_19_02_world.sql b/sql/old/6.x/world/00_2014_10_19/2014_10_19_02_world.sql
index f9285741671..f9285741671 100644
--- a/sql/updates/world/2014_10_19_02_world.sql
+++ b/sql/old/6.x/world/00_2014_10_19/2014_10_19_02_world.sql
diff --git a/sql/updates/world/2014_10_20_00_world.sql b/sql/old/6.x/world/00_2014_10_19/2014_10_20_00_world.sql
index 202aa2d73c8..202aa2d73c8 100644
--- a/sql/updates/world/2014_10_20_00_world.sql
+++ b/sql/old/6.x/world/00_2014_10_19/2014_10_20_00_world.sql
diff --git a/sql/updates/world/2014_10_20_00_world_from_335.sql b/sql/old/6.x/world/00_2014_10_19/2014_10_20_00_world_from_335.sql
index 89a6eb089d6..89a6eb089d6 100644
--- a/sql/updates/world/2014_10_20_00_world_from_335.sql
+++ b/sql/old/6.x/world/00_2014_10_19/2014_10_20_00_world_from_335.sql
diff --git a/sql/updates/world/2014_10_21_00_world.sql b/sql/old/6.x/world/00_2014_10_19/2014_10_21_00_world.sql
index 9a8b68bd99c..9a8b68bd99c 100644
--- a/sql/updates/world/2014_10_21_00_world.sql
+++ b/sql/old/6.x/world/00_2014_10_19/2014_10_21_00_world.sql
diff --git a/sql/updates/world/2014_10_22_00_world.sql b/sql/old/6.x/world/00_2014_10_19/2014_10_22_00_world.sql
index 602131fef08..602131fef08 100644
--- a/sql/updates/world/2014_10_22_00_world.sql
+++ b/sql/old/6.x/world/00_2014_10_19/2014_10_22_00_world.sql
diff --git a/sql/updates/world/2014_10_22_00_world_from_335.sql b/sql/old/6.x/world/00_2014_10_19/2014_10_22_00_world_from_335.sql
index 8da4f0600d9..8da4f0600d9 100644
--- a/sql/updates/world/2014_10_22_00_world_from_335.sql
+++ b/sql/old/6.x/world/00_2014_10_19/2014_10_22_00_world_from_335.sql
diff --git a/sql/updates/world/2014_10_22_01_world.sql b/sql/old/6.x/world/00_2014_10_19/2014_10_22_01_world.sql
index eee6baf61bb..eee6baf61bb 100644
--- a/sql/updates/world/2014_10_22_01_world.sql
+++ b/sql/old/6.x/world/00_2014_10_19/2014_10_22_01_world.sql
diff --git a/sql/updates/world/2014_10_23_00_world.sql b/sql/old/6.x/world/00_2014_10_19/2014_10_23_00_world.sql
index a4b0bcc5092..a4b0bcc5092 100644
--- a/sql/updates/world/2014_10_23_00_world.sql
+++ b/sql/old/6.x/world/00_2014_10_19/2014_10_23_00_world.sql
diff --git a/sql/updates/world/2014_10_23_01_world.sql b/sql/old/6.x/world/00_2014_10_19/2014_10_23_01_world.sql
index adedfe28d28..adedfe28d28 100644
--- a/sql/updates/world/2014_10_23_01_world.sql
+++ b/sql/old/6.x/world/00_2014_10_19/2014_10_23_01_world.sql
diff --git a/sql/updates/world/2014_10_24_01_world_from_335.sql b/sql/old/6.x/world/00_2014_10_19/2014_10_24_01_world_from_335.sql
index 8a3a9c8be3d..8a3a9c8be3d 100644
--- a/sql/updates/world/2014_10_24_01_world_from_335.sql
+++ b/sql/old/6.x/world/00_2014_10_19/2014_10_24_01_world_from_335.sql
diff --git a/sql/updates/world/2014_10_24_02_world.sql b/sql/old/6.x/world/00_2014_10_19/2014_10_24_02_world.sql
index f0ff963de81..f0ff963de81 100644
--- a/sql/updates/world/2014_10_24_02_world.sql
+++ b/sql/old/6.x/world/00_2014_10_19/2014_10_24_02_world.sql
diff --git a/sql/updates/world/2014_10_24_03_world.sql b/sql/old/6.x/world/00_2014_10_19/2014_10_24_03_world.sql
index 344e28d9739..344e28d9739 100644
--- a/sql/updates/world/2014_10_24_03_world.sql
+++ b/sql/old/6.x/world/00_2014_10_19/2014_10_24_03_world.sql
diff --git a/sql/updates/world/2014_10_24_04_world.sql b/sql/old/6.x/world/00_2014_10_19/2014_10_24_04_world.sql
index bc31c281f63..bc31c281f63 100644
--- a/sql/updates/world/2014_10_24_04_world.sql
+++ b/sql/old/6.x/world/00_2014_10_19/2014_10_24_04_world.sql
diff --git a/sql/updates/world/2014_10_25_00_world.sql b/sql/old/6.x/world/00_2014_10_19/2014_10_25_00_world.sql
index d82e3ba5ff5..d82e3ba5ff5 100644
--- a/sql/updates/world/2014_10_25_00_world.sql
+++ b/sql/old/6.x/world/00_2014_10_19/2014_10_25_00_world.sql
diff --git a/sql/updates/world/2014_10_26_00_world.sql b/sql/old/6.x/world/00_2014_10_19/2014_10_26_00_world.sql
index 9d9d9312677..9d9d9312677 100644
--- a/sql/updates/world/2014_10_26_00_world.sql
+++ b/sql/old/6.x/world/00_2014_10_19/2014_10_26_00_world.sql
diff --git a/sql/updates/world/2014_10_26_01_world.sql b/sql/old/6.x/world/00_2014_10_19/2014_10_26_01_world.sql
index 10a7a313e59..10a7a313e59 100644
--- a/sql/updates/world/2014_10_26_01_world.sql
+++ b/sql/old/6.x/world/00_2014_10_19/2014_10_26_01_world.sql
diff --git a/sql/updates/world/2014_10_26_02_world.sql b/sql/old/6.x/world/00_2014_10_19/2014_10_26_02_world.sql
index cc166ded806..cc166ded806 100644
--- a/sql/updates/world/2014_10_26_02_world.sql
+++ b/sql/old/6.x/world/00_2014_10_19/2014_10_26_02_world.sql
diff --git a/sql/updates/world/2014_10_26_03_world.sql b/sql/old/6.x/world/00_2014_10_19/2014_10_26_03_world.sql
index 06617dd39fa..06617dd39fa 100644
--- a/sql/updates/world/2014_10_26_03_world.sql
+++ b/sql/old/6.x/world/00_2014_10_19/2014_10_26_03_world.sql
diff --git a/sql/updates/world/2014_10_26_04_world.sql b/sql/old/6.x/world/00_2014_10_19/2014_10_26_04_world.sql
index d1c93b63cab..d1c93b63cab 100644
--- a/sql/updates/world/2014_10_26_04_world.sql
+++ b/sql/old/6.x/world/00_2014_10_19/2014_10_26_04_world.sql
diff --git a/sql/updates/world/2014_10_26_05_world.sql b/sql/old/6.x/world/00_2014_10_19/2014_10_26_05_world.sql
index 8e962b663b0..8e962b663b0 100644
--- a/sql/updates/world/2014_10_26_05_world.sql
+++ b/sql/old/6.x/world/00_2014_10_19/2014_10_26_05_world.sql
diff --git a/sql/updates/world/2014_10_26_06_world_from_335.sql b/sql/old/6.x/world/00_2014_10_19/2014_10_26_06_world_from_335.sql
index 2d9c9c57d50..2d9c9c57d50 100644
--- a/sql/updates/world/2014_10_26_06_world_from_335.sql
+++ b/sql/old/6.x/world/00_2014_10_19/2014_10_26_06_world_from_335.sql
diff --git a/sql/updates/world/2014_10_27_00_world.sql b/sql/old/6.x/world/00_2014_10_19/2014_10_27_00_world.sql
index 35ca85881fd..35ca85881fd 100644
--- a/sql/updates/world/2014_10_27_00_world.sql
+++ b/sql/old/6.x/world/00_2014_10_19/2014_10_27_00_world.sql
diff --git a/sql/updates/world/2014_10_27_01_world.sql b/sql/old/6.x/world/00_2014_10_19/2014_10_27_01_world.sql
index ca472ce298d..ca472ce298d 100644
--- a/sql/updates/world/2014_10_27_01_world.sql
+++ b/sql/old/6.x/world/00_2014_10_19/2014_10_27_01_world.sql
diff --git a/sql/updates/world/2014_10_27_02_world.sql b/sql/old/6.x/world/00_2014_10_19/2014_10_27_02_world.sql
index 8bc4564b2f3..8bc4564b2f3 100644
--- a/sql/updates/world/2014_10_27_02_world.sql
+++ b/sql/old/6.x/world/00_2014_10_19/2014_10_27_02_world.sql
diff --git a/sql/updates/world/2014_10_28_00_world.sql b/sql/old/6.x/world/00_2014_10_19/2014_10_28_00_world.sql
index bdb90e47854..bdb90e47854 100644
--- a/sql/updates/world/2014_10_28_00_world.sql
+++ b/sql/old/6.x/world/00_2014_10_19/2014_10_28_00_world.sql
diff --git a/sql/updates/world/2014_10_29_00_world.sql b/sql/old/6.x/world/00_2014_10_19/2014_10_29_00_world.sql
index 17a5769f634..17a5769f634 100644
--- a/sql/updates/world/2014_10_29_00_world.sql
+++ b/sql/old/6.x/world/00_2014_10_19/2014_10_29_00_world.sql
diff --git a/sql/updates/world/2014_10_29_01_world.sql b/sql/old/6.x/world/00_2014_10_19/2014_10_29_01_world.sql
index f29b6745133..f29b6745133 100644
--- a/sql/updates/world/2014_10_29_01_world.sql
+++ b/sql/old/6.x/world/00_2014_10_19/2014_10_29_01_world.sql
diff --git a/sql/updates/world/2014_10_30_00_world.sql b/sql/old/6.x/world/00_2014_10_19/2014_10_30_00_world.sql
index 30c528cf3f0..30c528cf3f0 100644
--- a/sql/updates/world/2014_10_30_00_world.sql
+++ b/sql/old/6.x/world/00_2014_10_19/2014_10_30_00_world.sql
diff --git a/sql/updates/world/2014_10_30_01_world.sql b/sql/old/6.x/world/00_2014_10_19/2014_10_30_01_world.sql
index bb39a4aad58..bb39a4aad58 100644
--- a/sql/updates/world/2014_10_30_01_world.sql
+++ b/sql/old/6.x/world/00_2014_10_19/2014_10_30_01_world.sql
diff --git a/sql/updates/world/2014_10_30_02_world.sql b/sql/old/6.x/world/00_2014_10_19/2014_10_30_02_world.sql
index a3de351d578..a3de351d578 100644
--- a/sql/updates/world/2014_10_30_02_world.sql
+++ b/sql/old/6.x/world/00_2014_10_19/2014_10_30_02_world.sql
diff --git a/sql/updates/world/2014_10_31_00_world.sql b/sql/old/6.x/world/00_2014_10_19/2014_10_31_00_world.sql
index 93ace3548ca..93ace3548ca 100644
--- a/sql/updates/world/2014_10_31_00_world.sql
+++ b/sql/old/6.x/world/00_2014_10_19/2014_10_31_00_world.sql
diff --git a/sql/updates/world/2014_10_31_01_world.sql b/sql/old/6.x/world/00_2014_10_19/2014_10_31_01_world.sql
index acc75f11bff..acc75f11bff 100644
--- a/sql/updates/world/2014_10_31_01_world.sql
+++ b/sql/old/6.x/world/00_2014_10_19/2014_10_31_01_world.sql
diff --git a/sql/updates/world/2014_10_31_02_world.sql b/sql/old/6.x/world/00_2014_10_19/2014_10_31_02_world.sql
index a3cfa1f57ce..a3cfa1f57ce 100644
--- a/sql/updates/world/2014_10_31_02_world.sql
+++ b/sql/old/6.x/world/00_2014_10_19/2014_10_31_02_world.sql
diff --git a/sql/updates/world/2014_10_31_03_world.sql b/sql/old/6.x/world/00_2014_10_19/2014_10_31_03_world.sql
index 89a792d63fe..89a792d63fe 100644
--- a/sql/updates/world/2014_10_31_03_world.sql
+++ b/sql/old/6.x/world/00_2014_10_19/2014_10_31_03_world.sql
diff --git a/sql/updates/world/2014_11_01_00_world.sql b/sql/old/6.x/world/00_2014_10_19/2014_11_01_00_world.sql
index d5b57f841ee..d5b57f841ee 100644
--- a/sql/updates/world/2014_11_01_00_world.sql
+++ b/sql/old/6.x/world/00_2014_10_19/2014_11_01_00_world.sql
diff --git a/sql/updates/world/2014_11_02_00_world.sql b/sql/old/6.x/world/00_2014_10_19/2014_11_02_00_world.sql
index 3ebe4aa8c2f..3ebe4aa8c2f 100644
--- a/sql/updates/world/2014_11_02_00_world.sql
+++ b/sql/old/6.x/world/00_2014_10_19/2014_11_02_00_world.sql
diff --git a/sql/updates/world/2014_11_02_01_world.sql b/sql/old/6.x/world/00_2014_10_19/2014_11_02_01_world.sql
index cd7d7d67ded..cd7d7d67ded 100644
--- a/sql/updates/world/2014_11_02_01_world.sql
+++ b/sql/old/6.x/world/00_2014_10_19/2014_11_02_01_world.sql
diff --git a/sql/updates/world/2014_11_02_02_world.sql b/sql/old/6.x/world/00_2014_10_19/2014_11_02_02_world.sql
index 5ae70c2326e..5ae70c2326e 100644
--- a/sql/updates/world/2014_11_02_02_world.sql
+++ b/sql/old/6.x/world/00_2014_10_19/2014_11_02_02_world.sql
diff --git a/sql/updates/world/2014_11_04_00_world.sql b/sql/old/6.x/world/00_2014_10_19/2014_11_04_00_world.sql
index 8fdd922f8f9..8fdd922f8f9 100644
--- a/sql/updates/world/2014_11_04_00_world.sql
+++ b/sql/old/6.x/world/00_2014_10_19/2014_11_04_00_world.sql
diff --git a/sql/updates/world/2014_11_07_00_world.sql b/sql/old/6.x/world/00_2014_10_19/2014_11_07_00_world.sql
index f10ca6690e0..f10ca6690e0 100644
--- a/sql/updates/world/2014_11_07_00_world.sql
+++ b/sql/old/6.x/world/00_2014_10_19/2014_11_07_00_world.sql
diff --git a/sql/updates/world/2014_11_07_01_world.sql b/sql/old/6.x/world/00_2014_10_19/2014_11_07_01_world.sql
index 9586e499b69..9586e499b69 100644
--- a/sql/updates/world/2014_11_07_01_world.sql
+++ b/sql/old/6.x/world/00_2014_10_19/2014_11_07_01_world.sql
diff --git a/sql/updates/world/2014_11_08_00_world.sql b/sql/old/6.x/world/00_2014_10_19/2014_11_08_00_world.sql
index 64a59180b46..64a59180b46 100644
--- a/sql/updates/world/2014_11_08_00_world.sql
+++ b/sql/old/6.x/world/00_2014_10_19/2014_11_08_00_world.sql
diff --git a/sql/updates/world/2014_11_08_01_world.sql b/sql/old/6.x/world/00_2014_10_19/2014_11_08_01_world.sql
index e6969ee08ab..e6969ee08ab 100644
--- a/sql/updates/world/2014_11_08_01_world.sql
+++ b/sql/old/6.x/world/00_2014_10_19/2014_11_08_01_world.sql
diff --git a/sql/updates/world/2014_11_08_02_world.sql b/sql/old/6.x/world/00_2014_10_19/2014_11_08_02_world.sql
index 08f64d64bd3..08f64d64bd3 100644
--- a/sql/updates/world/2014_11_08_02_world.sql
+++ b/sql/old/6.x/world/00_2014_10_19/2014_11_08_02_world.sql
diff --git a/sql/updates/world/2014_11_10_00_world.sql b/sql/old/6.x/world/00_2014_10_19/2014_11_10_00_world.sql
index f085114a035..f085114a035 100644
--- a/sql/updates/world/2014_11_10_00_world.sql
+++ b/sql/old/6.x/world/00_2014_10_19/2014_11_10_00_world.sql
diff --git a/sql/updates/world/2014_11_10_01_world.sql b/sql/old/6.x/world/00_2014_10_19/2014_11_10_01_world.sql
index e0d9be1f568..e0d9be1f568 100644
--- a/sql/updates/world/2014_11_10_01_world.sql
+++ b/sql/old/6.x/world/00_2014_10_19/2014_11_10_01_world.sql
diff --git a/sql/updates/world/2014_11_10_02_world.sql b/sql/old/6.x/world/00_2014_10_19/2014_11_10_02_world.sql
index 4b0fc4a4fe2..4b0fc4a4fe2 100644
--- a/sql/updates/world/2014_11_10_02_world.sql
+++ b/sql/old/6.x/world/00_2014_10_19/2014_11_10_02_world.sql
diff --git a/sql/updates/world/2014_11_10_03_world.sql b/sql/old/6.x/world/00_2014_10_19/2014_11_10_03_world.sql
index 41044e8c7ef..41044e8c7ef 100644
--- a/sql/updates/world/2014_11_10_03_world.sql
+++ b/sql/old/6.x/world/00_2014_10_19/2014_11_10_03_world.sql
diff --git a/sql/updates/world/2014_11_10_04_world.sql b/sql/old/6.x/world/00_2014_10_19/2014_11_10_04_world.sql
index 1b4857e4724..1b4857e4724 100644
--- a/sql/updates/world/2014_11_10_04_world.sql
+++ b/sql/old/6.x/world/00_2014_10_19/2014_11_10_04_world.sql
diff --git a/sql/updates/world/2014_11_10_05_world.sql b/sql/old/6.x/world/00_2014_10_19/2014_11_10_05_world.sql
index 2ffd85afa5e..2ffd85afa5e 100644
--- a/sql/updates/world/2014_11_10_05_world.sql
+++ b/sql/old/6.x/world/00_2014_10_19/2014_11_10_05_world.sql
diff --git a/sql/updates/world/2014_11_16_00_world.sql b/sql/old/6.x/world/00_2014_10_19/2014_11_16_00_world.sql
index f2483d6aed5..f2483d6aed5 100644
--- a/sql/updates/world/2014_11_16_00_world.sql
+++ b/sql/old/6.x/world/00_2014_10_19/2014_11_16_00_world.sql
diff --git a/sql/updates/world/2014_11_16_01_world.sql b/sql/old/6.x/world/00_2014_10_19/2014_11_16_01_world.sql
index f9742354fb5..f9742354fb5 100644
--- a/sql/updates/world/2014_11_16_01_world.sql
+++ b/sql/old/6.x/world/00_2014_10_19/2014_11_16_01_world.sql
diff --git a/sql/updates/world/2014_11_16_02_world.sql b/sql/old/6.x/world/00_2014_10_19/2014_11_16_02_world.sql
index e8b6f525f6f..e8b6f525f6f 100644
--- a/sql/updates/world/2014_11_16_02_world.sql
+++ b/sql/old/6.x/world/00_2014_10_19/2014_11_16_02_world.sql
diff --git a/sql/updates/world/2014_11_16_03_world.sql b/sql/old/6.x/world/00_2014_10_19/2014_11_16_03_world.sql
index 939c43f7056..939c43f7056 100644
--- a/sql/updates/world/2014_11_16_03_world.sql
+++ b/sql/old/6.x/world/00_2014_10_19/2014_11_16_03_world.sql
diff --git a/sql/updates/world/2014_11_16_04_world.sql b/sql/old/6.x/world/00_2014_10_19/2014_11_16_04_world.sql
index 0caefd879e9..0caefd879e9 100644
--- a/sql/updates/world/2014_11_16_04_world.sql
+++ b/sql/old/6.x/world/00_2014_10_19/2014_11_16_04_world.sql
diff --git a/sql/updates/world/2014_11_16_05_world.sql b/sql/old/6.x/world/00_2014_10_19/2014_11_16_05_world.sql
index 60bfbeb7eae..60bfbeb7eae 100644
--- a/sql/updates/world/2014_11_16_05_world.sql
+++ b/sql/old/6.x/world/00_2014_10_19/2014_11_16_05_world.sql
diff --git a/sql/updates/world/2014_11_16_06_world.sql b/sql/old/6.x/world/00_2014_10_19/2014_11_16_06_world.sql
index db999f41dac..db999f41dac 100644
--- a/sql/updates/world/2014_11_16_06_world.sql
+++ b/sql/old/6.x/world/00_2014_10_19/2014_11_16_06_world.sql
diff --git a/sql/updates/world/2014_11_19_00_world.sql b/sql/old/6.x/world/00_2014_10_19/2014_11_19_00_world.sql
index d2b188cbf69..d2b188cbf69 100644
--- a/sql/updates/world/2014_11_19_00_world.sql
+++ b/sql/old/6.x/world/00_2014_10_19/2014_11_19_00_world.sql
diff --git a/sql/updates/world/2014_11_19_01_world.sql b/sql/old/6.x/world/00_2014_10_19/2014_11_19_01_world.sql
index 3019db4045f..3019db4045f 100644
--- a/sql/updates/world/2014_11_19_01_world.sql
+++ b/sql/old/6.x/world/00_2014_10_19/2014_11_19_01_world.sql
diff --git a/sql/updates/world/2014_11_20_00_world.sql b/sql/old/6.x/world/00_2014_10_19/2014_11_20_00_world.sql
index d30256ee367..d30256ee367 100644
--- a/sql/updates/world/2014_11_20_00_world.sql
+++ b/sql/old/6.x/world/00_2014_10_19/2014_11_20_00_world.sql
diff --git a/sql/updates/world/2014_11_20_01_world.sql b/sql/old/6.x/world/00_2014_10_19/2014_11_20_01_world.sql
index 75474e72596..75474e72596 100644
--- a/sql/updates/world/2014_11_20_01_world.sql
+++ b/sql/old/6.x/world/00_2014_10_19/2014_11_20_01_world.sql
diff --git a/sql/updates/world/2014_11_20_02_world.sql b/sql/old/6.x/world/00_2014_10_19/2014_11_20_02_world.sql
index 1e0048e1943..1e0048e1943 100644
--- a/sql/updates/world/2014_11_20_02_world.sql
+++ b/sql/old/6.x/world/00_2014_10_19/2014_11_20_02_world.sql
diff --git a/sql/updates/world/2014_11_30_00_world.sql b/sql/old/6.x/world/00_2014_10_19/2014_11_30_00_world.sql
index d946231922c..d946231922c 100644
--- a/sql/updates/world/2014_11_30_00_world.sql
+++ b/sql/old/6.x/world/00_2014_10_19/2014_11_30_00_world.sql
diff --git a/sql/updates/world/2014_12_01_00_world.sql b/sql/old/6.x/world/00_2014_10_19/2014_12_01_00_world.sql
index 6e96a1bfe9a..6e96a1bfe9a 100644
--- a/sql/updates/world/2014_12_01_00_world.sql
+++ b/sql/old/6.x/world/00_2014_10_19/2014_12_01_00_world.sql
diff --git a/sql/updates/world/2014_12_04_00_world.sql b/sql/old/6.x/world/00_2014_10_19/2014_12_04_00_world.sql
index 5308b0f51d7..5308b0f51d7 100644
--- a/sql/updates/world/2014_12_04_00_world.sql
+++ b/sql/old/6.x/world/00_2014_10_19/2014_12_04_00_world.sql
diff --git a/sql/updates/world/2014_12_04_01_world.sql b/sql/old/6.x/world/00_2014_10_19/2014_12_04_01_world.sql
index 274bfe59f87..274bfe59f87 100644
--- a/sql/updates/world/2014_12_04_01_world.sql
+++ b/sql/old/6.x/world/00_2014_10_19/2014_12_04_01_world.sql
diff --git a/sql/updates/world/2014_12_12_00_world.sql b/sql/old/6.x/world/00_2014_10_19/2014_12_12_00_world.sql
index bf1854689b3..bf1854689b3 100644
--- a/sql/updates/world/2014_12_12_00_world.sql
+++ b/sql/old/6.x/world/00_2014_10_19/2014_12_12_00_world.sql
diff --git a/sql/updates/world/2014_12_12_01_world.sql b/sql/old/6.x/world/00_2014_10_19/2014_12_12_01_world.sql
index aa5b1641320..aa5b1641320 100644
--- a/sql/updates/world/2014_12_12_01_world.sql
+++ b/sql/old/6.x/world/00_2014_10_19/2014_12_12_01_world.sql
diff --git a/sql/updates/world/2014_12_12_02_world.sql b/sql/old/6.x/world/00_2014_10_19/2014_12_12_02_world.sql
index 6dc657b39e9..6dc657b39e9 100644
--- a/sql/updates/world/2014_12_12_02_world.sql
+++ b/sql/old/6.x/world/00_2014_10_19/2014_12_12_02_world.sql
diff --git a/sql/updates/world/2014_12_12_03_world.sql b/sql/old/6.x/world/00_2014_10_19/2014_12_12_03_world.sql
index 740e6e962aa..740e6e962aa 100644
--- a/sql/updates/world/2014_12_12_03_world.sql
+++ b/sql/old/6.x/world/00_2014_10_19/2014_12_12_03_world.sql
diff --git a/sql/updates/world/2014_12_13_00_world.sql b/sql/old/6.x/world/00_2014_10_19/2014_12_13_00_world.sql
index 3be9f73a293..3be9f73a293 100644
--- a/sql/updates/world/2014_12_13_00_world.sql
+++ b/sql/old/6.x/world/00_2014_10_19/2014_12_13_00_world.sql
diff --git a/sql/updates/world/2014_12_15_00_world.sql b/sql/old/6.x/world/00_2014_10_19/2014_12_15_00_world.sql
index 8ed026454c6..8ed026454c6 100644
--- a/sql/updates/world/2014_12_15_00_world.sql
+++ b/sql/old/6.x/world/00_2014_10_19/2014_12_15_00_world.sql
diff --git a/sql/updates/world/2014_12_17_00_world.sql b/sql/old/6.x/world/00_2014_10_19/2014_12_17_00_world.sql
index fd1e88f9c1a..fd1e88f9c1a 100644
--- a/sql/updates/world/2014_12_17_00_world.sql
+++ b/sql/old/6.x/world/00_2014_10_19/2014_12_17_00_world.sql
diff --git a/sql/updates/world/2014_12_19_00_world.sql b/sql/old/6.x/world/00_2014_10_19/2014_12_19_00_world.sql
index 5ba41a95258..5ba41a95258 100644
--- a/sql/updates/world/2014_12_19_00_world.sql
+++ b/sql/old/6.x/world/00_2014_10_19/2014_12_19_00_world.sql
diff --git a/sql/updates/world/2014_12_19_01_world.sql b/sql/old/6.x/world/00_2014_10_19/2014_12_19_01_world.sql
index 4285454ca95..4285454ca95 100644
--- a/sql/updates/world/2014_12_19_01_world.sql
+++ b/sql/old/6.x/world/00_2014_10_19/2014_12_19_01_world.sql
diff --git a/sql/updates/world/2014_12_21_00_world.sql b/sql/old/6.x/world/00_2014_10_19/2014_12_21_00_world.sql
index 857d7286352..857d7286352 100644
--- a/sql/updates/world/2014_12_21_00_world.sql
+++ b/sql/old/6.x/world/00_2014_10_19/2014_12_21_00_world.sql
diff --git a/sql/updates/world/2014_12_24_00_world.sql b/sql/old/6.x/world/00_2014_10_19/2014_12_24_00_world.sql
index 707996093b7..707996093b7 100644
--- a/sql/updates/world/2014_12_24_00_world.sql
+++ b/sql/old/6.x/world/00_2014_10_19/2014_12_24_00_world.sql
diff --git a/sql/updates/world/2014_12_25_00_world.sql b/sql/old/6.x/world/00_2014_10_19/2014_12_25_00_world.sql
index 1d3134dccfd..1d3134dccfd 100644
--- a/sql/updates/world/2014_12_25_00_world.sql
+++ b/sql/old/6.x/world/00_2014_10_19/2014_12_25_00_world.sql
diff --git a/sql/updates/world/2014_12_25_01_world.sql b/sql/old/6.x/world/00_2014_10_19/2014_12_25_01_world.sql
index c88adf4d130..c88adf4d130 100644
--- a/sql/updates/world/2014_12_25_01_world.sql
+++ b/sql/old/6.x/world/00_2014_10_19/2014_12_25_01_world.sql
diff --git a/sql/updates/world/2014_12_26_00_world.sql b/sql/old/6.x/world/00_2014_10_19/2014_12_26_00_world.sql
index c4de6d0f326..c4de6d0f326 100644
--- a/sql/updates/world/2014_12_26_00_world.sql
+++ b/sql/old/6.x/world/00_2014_10_19/2014_12_26_00_world.sql
diff --git a/sql/updates/world/2014_12_26_01_world.sql b/sql/old/6.x/world/00_2014_10_19/2014_12_26_01_world.sql
index 88fab3a362c..88fab3a362c 100644
--- a/sql/updates/world/2014_12_26_01_world.sql
+++ b/sql/old/6.x/world/00_2014_10_19/2014_12_26_01_world.sql
diff --git a/sql/updates/world/2014_12_26_02_world.sql b/sql/old/6.x/world/00_2014_10_19/2014_12_26_02_world.sql
index dd773a8bc3c..dd773a8bc3c 100644
--- a/sql/updates/world/2014_12_26_02_world.sql
+++ b/sql/old/6.x/world/00_2014_10_19/2014_12_26_02_world.sql
diff --git a/sql/updates/world/2014_12_26_03_world.sql b/sql/old/6.x/world/00_2014_10_19/2014_12_26_03_world.sql
index 3fcc3cf7cb2..3fcc3cf7cb2 100644
--- a/sql/updates/world/2014_12_26_03_world.sql
+++ b/sql/old/6.x/world/00_2014_10_19/2014_12_26_03_world.sql
diff --git a/sql/updates/world/2014_12_26_04_world.sql b/sql/old/6.x/world/00_2014_10_19/2014_12_26_04_world.sql
index 90ee138a237..90ee138a237 100644
--- a/sql/updates/world/2014_12_26_04_world.sql
+++ b/sql/old/6.x/world/00_2014_10_19/2014_12_26_04_world.sql
diff --git a/sql/updates/world/2014_12_26_05_world.sql b/sql/old/6.x/world/00_2014_10_19/2014_12_26_05_world.sql
index c7821cca3dc..c7821cca3dc 100644
--- a/sql/updates/world/2014_12_26_05_world.sql
+++ b/sql/old/6.x/world/00_2014_10_19/2014_12_26_05_world.sql
diff --git a/sql/updates/world/2014_12_26_06_world.sql b/sql/old/6.x/world/00_2014_10_19/2014_12_26_06_world.sql
index d6336016ddb..d6336016ddb 100644
--- a/sql/updates/world/2014_12_26_06_world.sql
+++ b/sql/old/6.x/world/00_2014_10_19/2014_12_26_06_world.sql
diff --git a/sql/updates/world/2014_12_26_07_world.sql b/sql/old/6.x/world/00_2014_10_19/2014_12_26_07_world.sql
index 984b8b1f91f..984b8b1f91f 100644
--- a/sql/updates/world/2014_12_26_07_world.sql
+++ b/sql/old/6.x/world/00_2014_10_19/2014_12_26_07_world.sql
diff --git a/sql/updates/world/2014_12_27_00_world.sql b/sql/old/6.x/world/00_2014_10_19/2014_12_27_00_world.sql
index 021834b78f7..021834b78f7 100644
--- a/sql/updates/world/2014_12_27_00_world.sql
+++ b/sql/old/6.x/world/00_2014_10_19/2014_12_27_00_world.sql
diff --git a/sql/updates/world/2014_12_27_01_world.sql b/sql/old/6.x/world/00_2014_10_19/2014_12_27_01_world.sql
index 499b061ed19..499b061ed19 100644
--- a/sql/updates/world/2014_12_27_01_world.sql
+++ b/sql/old/6.x/world/00_2014_10_19/2014_12_27_01_world.sql
diff --git a/sql/updates/world/2014_12_27_02_world.sql b/sql/old/6.x/world/00_2014_10_19/2014_12_27_02_world.sql
index fb754818707..fb754818707 100644
--- a/sql/updates/world/2014_12_27_02_world.sql
+++ b/sql/old/6.x/world/00_2014_10_19/2014_12_27_02_world.sql
diff --git a/sql/updates/world/2014_12_27_03_world.sql b/sql/old/6.x/world/00_2014_10_19/2014_12_27_03_world.sql
index f623d6d03c8..f623d6d03c8 100644
--- a/sql/updates/world/2014_12_27_03_world.sql
+++ b/sql/old/6.x/world/00_2014_10_19/2014_12_27_03_world.sql
diff --git a/sql/updates/world/2014_12_27_04_world.sql b/sql/old/6.x/world/00_2014_10_19/2014_12_27_04_world.sql
index c67094f8d1f..c67094f8d1f 100644
--- a/sql/updates/world/2014_12_27_04_world.sql
+++ b/sql/old/6.x/world/00_2014_10_19/2014_12_27_04_world.sql
diff --git a/sql/updates/world/2014_12_27_05_world.sql b/sql/old/6.x/world/00_2014_10_19/2014_12_27_05_world.sql
index 9b28c4e6071..9b28c4e6071 100644
--- a/sql/updates/world/2014_12_27_05_world.sql
+++ b/sql/old/6.x/world/00_2014_10_19/2014_12_27_05_world.sql
diff --git a/sql/updates/world/2014_12_27_06_world.sql b/sql/old/6.x/world/00_2014_10_19/2014_12_27_06_world.sql
index 49b3c43e3e1..49b3c43e3e1 100644
--- a/sql/updates/world/2014_12_27_06_world.sql
+++ b/sql/old/6.x/world/00_2014_10_19/2014_12_27_06_world.sql
diff --git a/sql/updates/world/2014_12_27_07_world.sql b/sql/old/6.x/world/00_2014_10_19/2014_12_27_07_world.sql
index fadfc18187c..fadfc18187c 100644
--- a/sql/updates/world/2014_12_27_07_world.sql
+++ b/sql/old/6.x/world/00_2014_10_19/2014_12_27_07_world.sql
diff --git a/sql/updates/world/2014_12_27_08_world.sql b/sql/old/6.x/world/00_2014_10_19/2014_12_27_08_world.sql
index 1c0ab783080..1c0ab783080 100644
--- a/sql/updates/world/2014_12_27_08_world.sql
+++ b/sql/old/6.x/world/00_2014_10_19/2014_12_27_08_world.sql
diff --git a/sql/updates/world/2014_12_28_00_world.sql b/sql/old/6.x/world/00_2014_10_19/2014_12_28_00_world.sql
index e71ec1cf8bb..e71ec1cf8bb 100644
--- a/sql/updates/world/2014_12_28_00_world.sql
+++ b/sql/old/6.x/world/00_2014_10_19/2014_12_28_00_world.sql
diff --git a/sql/updates/world/2014_12_28_01_world.sql b/sql/old/6.x/world/00_2014_10_19/2014_12_28_01_world.sql
index c571069edca..c571069edca 100644
--- a/sql/updates/world/2014_12_28_01_world.sql
+++ b/sql/old/6.x/world/00_2014_10_19/2014_12_28_01_world.sql
diff --git a/sql/updates/world/2014_12_28_02_world.sql b/sql/old/6.x/world/00_2014_10_19/2014_12_28_02_world.sql
index 9bbd10e71b6..9bbd10e71b6 100644
--- a/sql/updates/world/2014_12_28_02_world.sql
+++ b/sql/old/6.x/world/00_2014_10_19/2014_12_28_02_world.sql
diff --git a/sql/updates/world/2014_12_28_03_world.sql b/sql/old/6.x/world/00_2014_10_19/2014_12_28_03_world.sql
index bc44ddd1cd1..bc44ddd1cd1 100644
--- a/sql/updates/world/2014_12_28_03_world.sql
+++ b/sql/old/6.x/world/00_2014_10_19/2014_12_28_03_world.sql
diff --git a/sql/updates/world/2014_12_28_04_world.sql b/sql/old/6.x/world/00_2014_10_19/2014_12_28_04_world.sql
index abd02d38d13..abd02d38d13 100644
--- a/sql/updates/world/2014_12_28_04_world.sql
+++ b/sql/old/6.x/world/00_2014_10_19/2014_12_28_04_world.sql
diff --git a/sql/updates/world/2014_12_28_05_world.sql b/sql/old/6.x/world/00_2014_10_19/2014_12_28_05_world.sql
index e3e7f680de1..e3e7f680de1 100644
--- a/sql/updates/world/2014_12_28_05_world.sql
+++ b/sql/old/6.x/world/00_2014_10_19/2014_12_28_05_world.sql
diff --git a/sql/updates/world/2014_12_28_06_world.sql b/sql/old/6.x/world/00_2014_10_19/2014_12_28_06_world.sql
index 8a1b29a8169..8a1b29a8169 100644
--- a/sql/updates/world/2014_12_28_06_world.sql
+++ b/sql/old/6.x/world/00_2014_10_19/2014_12_28_06_world.sql
diff --git a/sql/updates/world/2014_12_28_07_world.sql b/sql/old/6.x/world/00_2014_10_19/2014_12_28_07_world.sql
index f3fd0021214..f3fd0021214 100644
--- a/sql/updates/world/2014_12_28_07_world.sql
+++ b/sql/old/6.x/world/00_2014_10_19/2014_12_28_07_world.sql
diff --git a/sql/updates/world/2014_12_29_00_world.sql b/sql/old/6.x/world/00_2014_10_19/2014_12_29_00_world.sql
index 3d52e7d88ff..3d52e7d88ff 100644
--- a/sql/updates/world/2014_12_29_00_world.sql
+++ b/sql/old/6.x/world/00_2014_10_19/2014_12_29_00_world.sql
diff --git a/sql/updates/world/2014_12_30_00_world.sql b/sql/old/6.x/world/00_2014_10_19/2014_12_30_00_world.sql
index d1fad59b940..d1fad59b940 100644
--- a/sql/updates/world/2014_12_30_00_world.sql
+++ b/sql/old/6.x/world/00_2014_10_19/2014_12_30_00_world.sql
diff --git a/sql/updates/world/2015_01_10_00_world.sql b/sql/old/6.x/world/00_2014_10_19/2015_01_10_00_world.sql
index d5943731a50..d5943731a50 100644
--- a/sql/updates/world/2015_01_10_00_world.sql
+++ b/sql/old/6.x/world/00_2014_10_19/2015_01_10_00_world.sql
diff --git a/sql/updates/world/2015_01_10_01_world.sql b/sql/old/6.x/world/00_2014_10_19/2015_01_10_01_world.sql
index 45be14c717b..45be14c717b 100644
--- a/sql/updates/world/2015_01_10_01_world.sql
+++ b/sql/old/6.x/world/00_2014_10_19/2015_01_10_01_world.sql
diff --git a/sql/updates/world/2015_01_10_02_world.sql b/sql/old/6.x/world/00_2014_10_19/2015_01_10_02_world.sql
index 0dc1d6b9eb0..0dc1d6b9eb0 100644
--- a/sql/updates/world/2015_01_10_02_world.sql
+++ b/sql/old/6.x/world/00_2014_10_19/2015_01_10_02_world.sql
diff --git a/sql/updates/world/2015_01_10_03_world.sql b/sql/old/6.x/world/00_2014_10_19/2015_01_10_03_world.sql
index 8516179e28a..8516179e28a 100644
--- a/sql/updates/world/2015_01_10_03_world.sql
+++ b/sql/old/6.x/world/00_2014_10_19/2015_01_10_03_world.sql
diff --git a/sql/updates/world/2015_01_10_04_world.sql b/sql/old/6.x/world/00_2014_10_19/2015_01_10_04_world.sql
index 769dcefdd0c..769dcefdd0c 100644
--- a/sql/updates/world/2015_01_10_04_world.sql
+++ b/sql/old/6.x/world/00_2014_10_19/2015_01_10_04_world.sql
diff --git a/sql/updates/world/2015_01_10_05_world.sql b/sql/old/6.x/world/00_2014_10_19/2015_01_10_05_world.sql
index fe8596356e2..fe8596356e2 100644
--- a/sql/updates/world/2015_01_10_05_world.sql
+++ b/sql/old/6.x/world/00_2014_10_19/2015_01_10_05_world.sql
diff --git a/sql/updates/world/2015_01_10_06_world.sql b/sql/old/6.x/world/00_2014_10_19/2015_01_10_06_world.sql
index 6c7f42580d3..6c7f42580d3 100644
--- a/sql/updates/world/2015_01_10_06_world.sql
+++ b/sql/old/6.x/world/00_2014_10_19/2015_01_10_06_world.sql
diff --git a/sql/updates/world/2015_01_10_07_world.sql b/sql/old/6.x/world/00_2014_10_19/2015_01_10_07_world.sql
index d35f31f348c..d35f31f348c 100644
--- a/sql/updates/world/2015_01_10_07_world.sql
+++ b/sql/old/6.x/world/00_2014_10_19/2015_01_10_07_world.sql
diff --git a/sql/updates/world/2015_01_11_01_world.sql b/sql/old/6.x/world/00_2014_10_19/2015_01_11_01_world.sql
index ed475365e80..ed475365e80 100644
--- a/sql/updates/world/2015_01_11_01_world.sql
+++ b/sql/old/6.x/world/00_2014_10_19/2015_01_11_01_world.sql
diff --git a/sql/updates/world/2015_01_11_02_world.sql b/sql/old/6.x/world/00_2014_10_19/2015_01_11_02_world.sql
index 6f99ca4cc6a..6f99ca4cc6a 100644
--- a/sql/updates/world/2015_01_11_02_world.sql
+++ b/sql/old/6.x/world/00_2014_10_19/2015_01_11_02_world.sql
diff --git a/sql/updates/world/2015_01_11_03_world.sql b/sql/old/6.x/world/00_2014_10_19/2015_01_11_03_world.sql
index 9dc06124b12..9dc06124b12 100644
--- a/sql/updates/world/2015_01_11_03_world.sql
+++ b/sql/old/6.x/world/00_2014_10_19/2015_01_11_03_world.sql
diff --git a/sql/updates/world/2015_01_12_00_world.sql b/sql/old/6.x/world/00_2014_10_19/2015_01_12_00_world.sql
index dfe4e710ccb..dfe4e710ccb 100644
--- a/sql/updates/world/2015_01_12_00_world.sql
+++ b/sql/old/6.x/world/00_2014_10_19/2015_01_12_00_world.sql
diff --git a/sql/updates/world/2015_01_15_00_world.sql b/sql/old/6.x/world/00_2014_10_19/2015_01_15_00_world.sql
index 2840e36bcf2..2840e36bcf2 100644
--- a/sql/updates/world/2015_01_15_00_world.sql
+++ b/sql/old/6.x/world/00_2014_10_19/2015_01_15_00_world.sql
diff --git a/sql/updates/world/2015_01_16_00_world.sql b/sql/old/6.x/world/00_2014_10_19/2015_01_16_00_world.sql
index d4ed9192b46..d4ed9192b46 100644
--- a/sql/updates/world/2015_01_16_00_world.sql
+++ b/sql/old/6.x/world/00_2014_10_19/2015_01_16_00_world.sql
diff --git a/sql/updates/world/2015_01_18_00_world.sql b/sql/old/6.x/world/00_2014_10_19/2015_01_18_00_world.sql
index 3b0cfd4b9e6..3b0cfd4b9e6 100644
--- a/sql/updates/world/2015_01_18_00_world.sql
+++ b/sql/old/6.x/world/00_2014_10_19/2015_01_18_00_world.sql
diff --git a/sql/updates/world/2015_01_30_00_world.sql b/sql/old/6.x/world/00_2014_10_19/2015_01_30_00_world.sql
index 57910525e52..57910525e52 100644
--- a/sql/updates/world/2015_01_30_00_world.sql
+++ b/sql/old/6.x/world/00_2014_10_19/2015_01_30_00_world.sql
diff --git a/sql/updates/world/2015_01_30_01_world.sql b/sql/old/6.x/world/00_2014_10_19/2015_01_30_01_world.sql
index 0b88e0d01d4..0b88e0d01d4 100644
--- a/sql/updates/world/2015_01_30_01_world.sql
+++ b/sql/old/6.x/world/00_2014_10_19/2015_01_30_01_world.sql
diff --git a/sql/updates/world/2015_02_02_00_world.sql b/sql/old/6.x/world/00_2014_10_19/2015_02_02_00_world.sql
index 7cf4f5c3a3b..7cf4f5c3a3b 100644
--- a/sql/updates/world/2015_02_02_00_world.sql
+++ b/sql/old/6.x/world/00_2014_10_19/2015_02_02_00_world.sql
diff --git a/sql/updates/world/2015_02_02_00_world_from_335.sql b/sql/old/6.x/world/00_2014_10_19/2015_02_02_00_world_from_335.sql
index 84d31ef7be1..84d31ef7be1 100644
--- a/sql/updates/world/2015_02_02_00_world_from_335.sql
+++ b/sql/old/6.x/world/00_2014_10_19/2015_02_02_00_world_from_335.sql
diff --git a/sql/updates/world/2015_02_02_01_world.sql b/sql/old/6.x/world/00_2014_10_19/2015_02_02_01_world.sql
index 3683d2db6af..3683d2db6af 100644
--- a/sql/updates/world/2015_02_02_01_world.sql
+++ b/sql/old/6.x/world/00_2014_10_19/2015_02_02_01_world.sql
diff --git a/sql/updates/world/2015_02_06_00_world.sql b/sql/old/6.x/world/00_2014_10_19/2015_02_06_00_world.sql
index 465c0a30970..465c0a30970 100644
--- a/sql/updates/world/2015_02_06_00_world.sql
+++ b/sql/old/6.x/world/00_2014_10_19/2015_02_06_00_world.sql
diff --git a/sql/updates/world/2015_02_08_00_world.sql b/sql/old/6.x/world/00_2014_10_19/2015_02_08_00_world.sql
index 38119c373dc..38119c373dc 100644
--- a/sql/updates/world/2015_02_08_00_world.sql
+++ b/sql/old/6.x/world/00_2014_10_19/2015_02_08_00_world.sql
diff --git a/sql/updates/world/2015_02_11_00_world.sql b/sql/old/6.x/world/00_2014_10_19/2015_02_11_00_world.sql
index 4e855d6fa06..4e855d6fa06 100644
--- a/sql/updates/world/2015_02_11_00_world.sql
+++ b/sql/old/6.x/world/00_2014_10_19/2015_02_11_00_world.sql
diff --git a/sql/updates/world/2015_02_12_00_world.sql b/sql/old/6.x/world/00_2014_10_19/2015_02_12_00_world.sql
index ff046037be6..ff046037be6 100644
--- a/sql/updates/world/2015_02_12_00_world.sql
+++ b/sql/old/6.x/world/00_2014_10_19/2015_02_12_00_world.sql
diff --git a/sql/updates/world/2015_02_13_00_world.sql b/sql/old/6.x/world/00_2014_10_19/2015_02_13_00_world.sql
index f510682f090..f510682f090 100644
--- a/sql/updates/world/2015_02_13_00_world.sql
+++ b/sql/old/6.x/world/00_2014_10_19/2015_02_13_00_world.sql
diff --git a/sql/updates/world/2015_02_18_00_world.sql b/sql/old/6.x/world/00_2014_10_19/2015_02_18_00_world.sql
index 6a4c12347a3..6a4c12347a3 100644
--- a/sql/updates/world/2015_02_18_00_world.sql
+++ b/sql/old/6.x/world/00_2014_10_19/2015_02_18_00_world.sql
diff --git a/sql/updates/world/2015_02_19_00_world.sql b/sql/old/6.x/world/00_2014_10_19/2015_02_19_00_world.sql
index 56e08c982f2..56e08c982f2 100644
--- a/sql/updates/world/2015_02_19_00_world.sql
+++ b/sql/old/6.x/world/00_2014_10_19/2015_02_19_00_world.sql
diff --git a/sql/updates/world/2015_02_20_00_world.sql b/sql/old/6.x/world/00_2014_10_19/2015_02_20_00_world.sql
index 643e91161ed..643e91161ed 100644
--- a/sql/updates/world/2015_02_20_00_world.sql
+++ b/sql/old/6.x/world/00_2014_10_19/2015_02_20_00_world.sql
diff --git a/sql/updates/world/2015_02_20_01_world.sql b/sql/old/6.x/world/00_2014_10_19/2015_02_20_01_world.sql
index 984d19af5d4..984d19af5d4 100644
--- a/sql/updates/world/2015_02_20_01_world.sql
+++ b/sql/old/6.x/world/00_2014_10_19/2015_02_20_01_world.sql
diff --git a/sql/updates/world/2015_02_20_02_world.sql b/sql/old/6.x/world/00_2014_10_19/2015_02_20_02_world.sql
index 225719a435d..225719a435d 100644
--- a/sql/updates/world/2015_02_20_02_world.sql
+++ b/sql/old/6.x/world/00_2014_10_19/2015_02_20_02_world.sql
diff --git a/sql/updates/world/2015_02_22_00_world.sql b/sql/old/6.x/world/00_2014_10_19/2015_02_22_00_world.sql
index 32391b6dc15..32391b6dc15 100644
--- a/sql/updates/world/2015_02_22_00_world.sql
+++ b/sql/old/6.x/world/00_2014_10_19/2015_02_22_00_world.sql
diff --git a/sql/updates/world/2015_02_22_01_world.sql b/sql/old/6.x/world/00_2014_10_19/2015_02_22_01_world.sql
index 124becb6675..124becb6675 100644
--- a/sql/updates/world/2015_02_22_01_world.sql
+++ b/sql/old/6.x/world/00_2014_10_19/2015_02_22_01_world.sql
diff --git a/sql/updates/world/2015_03_07_00_world.sql b/sql/old/6.x/world/00_2014_10_19/2015_03_07_00_world.sql
index 4cc5d647e1a..4cc5d647e1a 100644
--- a/sql/updates/world/2015_03_07_00_world.sql
+++ b/sql/old/6.x/world/00_2014_10_19/2015_03_07_00_world.sql
diff --git a/sql/updates/world/2015_03_07_01_world.sql b/sql/old/6.x/world/00_2014_10_19/2015_03_07_01_world.sql
index df26ef1f267..df26ef1f267 100644
--- a/sql/updates/world/2015_03_07_01_world.sql
+++ b/sql/old/6.x/world/00_2014_10_19/2015_03_07_01_world.sql
diff --git a/sql/updates/world/2015_03_07_02_world.sql b/sql/old/6.x/world/00_2014_10_19/2015_03_07_02_world.sql
index 8d8fe3be881..8d8fe3be881 100644
--- a/sql/updates/world/2015_03_07_02_world.sql
+++ b/sql/old/6.x/world/00_2014_10_19/2015_03_07_02_world.sql
diff --git a/sql/updates/world/2015_03_07_03_world.sql b/sql/old/6.x/world/00_2014_10_19/2015_03_07_03_world.sql
index e2a7639d5ae..e2a7639d5ae 100644
--- a/sql/updates/world/2015_03_07_03_world.sql
+++ b/sql/old/6.x/world/00_2014_10_19/2015_03_07_03_world.sql
diff --git a/sql/updates/world/2015_03_10_00_world.sql b/sql/old/6.x/world/00_2014_10_19/2015_03_10_00_world.sql
index befd7f94145..befd7f94145 100644
--- a/sql/updates/world/2015_03_10_00_world.sql
+++ b/sql/old/6.x/world/00_2014_10_19/2015_03_10_00_world.sql
diff --git a/sql/updates/world/2015_03_16_00_world.sql b/sql/old/6.x/world/00_2014_10_19/2015_03_16_00_world.sql
index 123bd8511cd..123bd8511cd 100644
--- a/sql/updates/world/2015_03_16_00_world.sql
+++ b/sql/old/6.x/world/00_2014_10_19/2015_03_16_00_world.sql
diff --git a/sql/updates/world/2015_03_16_01_world.sql b/sql/old/6.x/world/00_2014_10_19/2015_03_16_01_world.sql
index c6ecea91784..c6ecea91784 100644
--- a/sql/updates/world/2015_03_16_01_world.sql
+++ b/sql/old/6.x/world/00_2014_10_19/2015_03_16_01_world.sql
diff --git a/sql/updates/world/2015_03_16_02_world.sql b/sql/old/6.x/world/00_2014_10_19/2015_03_16_02_world.sql
index 292f80c7401..292f80c7401 100644
--- a/sql/updates/world/2015_03_16_02_world.sql
+++ b/sql/old/6.x/world/00_2014_10_19/2015_03_16_02_world.sql
diff --git a/sql/updates/world/2015_03_16_03_world.sql b/sql/old/6.x/world/00_2014_10_19/2015_03_16_03_world.sql
index 017ef562ccc..017ef562ccc 100644
--- a/sql/updates/world/2015_03_16_03_world.sql
+++ b/sql/old/6.x/world/00_2014_10_19/2015_03_16_03_world.sql
diff --git a/sql/updates/world/2015_03_16_04_world.sql b/sql/old/6.x/world/00_2014_10_19/2015_03_16_04_world.sql
index 099715b23b2..099715b23b2 100644
--- a/sql/updates/world/2015_03_16_04_world.sql
+++ b/sql/old/6.x/world/00_2014_10_19/2015_03_16_04_world.sql
diff --git a/sql/updates/world/2015_03_16_05_world.sql b/sql/old/6.x/world/00_2014_10_19/2015_03_16_05_world.sql
index b577abe05e7..b577abe05e7 100644
--- a/sql/updates/world/2015_03_16_05_world.sql
+++ b/sql/old/6.x/world/00_2014_10_19/2015_03_16_05_world.sql
diff --git a/sql/updates/world/2015_03_16_06_world.sql b/sql/old/6.x/world/00_2014_10_19/2015_03_16_06_world.sql
index b36f8c6e2d6..b36f8c6e2d6 100644
--- a/sql/updates/world/2015_03_16_06_world.sql
+++ b/sql/old/6.x/world/00_2014_10_19/2015_03_16_06_world.sql
diff --git a/sql/updates/world/2015_03_16_07_world.sql b/sql/old/6.x/world/00_2014_10_19/2015_03_16_07_world.sql
index 4078fffad9d..4078fffad9d 100644
--- a/sql/updates/world/2015_03_16_07_world.sql
+++ b/sql/old/6.x/world/00_2014_10_19/2015_03_16_07_world.sql
diff --git a/sql/updates/world/2015_03_16_08_world.sql b/sql/old/6.x/world/00_2014_10_19/2015_03_16_08_world.sql
index 854c017745f..854c017745f 100644
--- a/sql/updates/world/2015_03_16_08_world.sql
+++ b/sql/old/6.x/world/00_2014_10_19/2015_03_16_08_world.sql
diff --git a/sql/updates/world/2015_03_16_09_world.sql b/sql/old/6.x/world/00_2014_10_19/2015_03_16_09_world.sql
index 4487e9efa4c..4487e9efa4c 100644
--- a/sql/updates/world/2015_03_16_09_world.sql
+++ b/sql/old/6.x/world/00_2014_10_19/2015_03_16_09_world.sql
diff --git a/sql/updates/world/2015_03_16_10_world.sql b/sql/old/6.x/world/00_2014_10_19/2015_03_16_10_world.sql
index 1dce6c40205..1dce6c40205 100644
--- a/sql/updates/world/2015_03_16_10_world.sql
+++ b/sql/old/6.x/world/00_2014_10_19/2015_03_16_10_world.sql
diff --git a/sql/updates/world/2015_03_17_00_world.sql b/sql/old/6.x/world/00_2014_10_19/2015_03_17_00_world.sql
index 01ddab42991..01ddab42991 100644
--- a/sql/updates/world/2015_03_17_00_world.sql
+++ b/sql/old/6.x/world/00_2014_10_19/2015_03_17_00_world.sql
diff --git a/sql/updates/world/2015_03_17_02_world.sql b/sql/old/6.x/world/00_2014_10_19/2015_03_17_02_world.sql
index 79d0b382d12..79d0b382d12 100644
--- a/sql/updates/world/2015_03_17_02_world.sql
+++ b/sql/old/6.x/world/00_2014_10_19/2015_03_17_02_world.sql
diff --git a/sql/updates/world/2015_03_18_00_world.sql b/sql/old/6.x/world/00_2014_10_19/2015_03_18_00_world.sql
index 1dde474d21f..1dde474d21f 100644
--- a/sql/updates/world/2015_03_18_00_world.sql
+++ b/sql/old/6.x/world/00_2014_10_19/2015_03_18_00_world.sql
diff --git a/sql/updates/world/2015_03_18_01_world.sql b/sql/old/6.x/world/00_2014_10_19/2015_03_18_01_world.sql
index 92fc785b72d..92fc785b72d 100644
--- a/sql/updates/world/2015_03_18_01_world.sql
+++ b/sql/old/6.x/world/00_2014_10_19/2015_03_18_01_world.sql
diff --git a/sql/updates/world/2015_03_19_00_world.sql b/sql/old/6.x/world/00_2014_10_19/2015_03_19_00_world.sql
index b08542dab48..b08542dab48 100644
--- a/sql/updates/world/2015_03_19_00_world.sql
+++ b/sql/old/6.x/world/00_2014_10_19/2015_03_19_00_world.sql
diff --git a/sql/updates/world/2015_03_20_00_world.sql b/sql/old/6.x/world/00_2014_10_19/2015_03_20_00_world.sql
index 93083732c4d..93083732c4d 100644
--- a/sql/updates/world/2015_03_20_00_world.sql
+++ b/sql/old/6.x/world/00_2014_10_19/2015_03_20_00_world.sql
diff --git a/sql/updates/world/2015_03_20_01_world.sql b/sql/old/6.x/world/00_2014_10_19/2015_03_20_01_world.sql
index 96984da0594..96984da0594 100644
--- a/sql/updates/world/2015_03_20_01_world.sql
+++ b/sql/old/6.x/world/00_2014_10_19/2015_03_20_01_world.sql
diff --git a/sql/updates/world/2015_03_20_02_world.sql b/sql/old/6.x/world/00_2014_10_19/2015_03_20_02_world.sql
index 30b880d4527..30b880d4527 100644
--- a/sql/updates/world/2015_03_20_02_world.sql
+++ b/sql/old/6.x/world/00_2014_10_19/2015_03_20_02_world.sql
diff --git a/sql/updates/world/2015_03_20_03_world.sql b/sql/old/6.x/world/00_2014_10_19/2015_03_20_03_world.sql
index 44dc5f28229..44dc5f28229 100644
--- a/sql/updates/world/2015_03_20_03_world.sql
+++ b/sql/old/6.x/world/00_2014_10_19/2015_03_20_03_world.sql
diff --git a/sql/updates/world/2015_03_20_04_world.sql b/sql/old/6.x/world/00_2014_10_19/2015_03_20_04_world.sql
index 05c120274da..05c120274da 100644
--- a/sql/updates/world/2015_03_20_04_world.sql
+++ b/sql/old/6.x/world/00_2014_10_19/2015_03_20_04_world.sql
diff --git a/sql/updates/world/2015_03_20_05_world.sql b/sql/old/6.x/world/00_2014_10_19/2015_03_20_05_world.sql
index 018e1929c34..018e1929c34 100644
--- a/sql/updates/world/2015_03_20_05_world.sql
+++ b/sql/old/6.x/world/00_2014_10_19/2015_03_20_05_world.sql
diff --git a/sql/updates/world/2015_03_20_06_world.sql b/sql/old/6.x/world/00_2014_10_19/2015_03_20_06_world.sql
index 692381573eb..692381573eb 100644
--- a/sql/updates/world/2015_03_20_06_world.sql
+++ b/sql/old/6.x/world/00_2014_10_19/2015_03_20_06_world.sql
diff --git a/sql/old/6.x/world/CREATE_SUBDIRECTORIES_HERE b/sql/old/6.x/world/CREATE_SUBDIRECTORIES_HERE
deleted file mode 100644
index e69de29bb2d..00000000000
--- a/sql/old/6.x/world/CREATE_SUBDIRECTORIES_HERE
+++ /dev/null
diff --git a/sql/updates/world/2015_03_21_00_world.sql b/sql/updates/world/2015_03_21_00_world.sql
new file mode 100644
index 00000000000..1fff83cbb3d
--- /dev/null
+++ b/sql/updates/world/2015_03_21_00_world.sql
@@ -0,0 +1 @@
+UPDATE `version` SET `db_version`='TDB 6.01', `cache_id`=1 LIMIT 1;
diff --git a/src/server/shared/Database/DatabaseLoader.h b/src/server/shared/Database/DatabaseLoader.h
index 0d31ef1686c..3bbf7e75771 100644
--- a/src/server/shared/Database/DatabaseLoader.h
+++ b/src/server/shared/Database/DatabaseLoader.h
@@ -60,9 +60,9 @@ private:
 
     static bool Process(std::stack<Predicate>& stack);
 
+    std::string const _logger;
     bool const _autoSetup;
     uint32 const _updateFlags;
-    std::string const _logger;
 
     std::stack<std::pair<Predicate, std::function<void()>>> _open;
     std::stack<std::function<void()>> _close;
diff --git a/src/server/shared/Updater/DBUpdater.cpp b/src/server/shared/Updater/DBUpdater.cpp
index 68c8b76e3f7..156c2a8fdd4 100644
--- a/src/server/shared/Updater/DBUpdater.cpp
+++ b/src/server/shared/Updater/DBUpdater.cpp
@@ -154,7 +154,7 @@ std::string DBUpdater<HotfixDatabaseConnection>::GetTableName()
 template<>
 std::string DBUpdater<HotfixDatabaseConnection>::GetBaseFile()
 {
-    return DBUpdater<HotfixDatabaseConnection>::GetSourceDirectory() + "/sql/base/hotfixes_database.sql";
+    return _HOTFIXES_DATABASE;
 }
 
 template<>
@@ -164,6 +164,12 @@ bool DBUpdater<HotfixDatabaseConnection>::IsEnabled(uint32 const updateMask)
     return (updateMask & DatabaseLoader::DATABASE_HOTFIX) ? true : false;
 }
 
+template<>
+BaseLocation DBUpdater<HotfixDatabaseConnection>::GetBaseLocationType()
+{
+    return LOCATION_DOWNLOAD;
+}
+
 // All
 template<class T>
 BaseLocation DBUpdater<T>::GetBaseLocationType()