Misc: Fixed sql import, added new changes to world_database.sql, removed duplicate definition of ObjectGuidGenerator<HIGHGUID_PET>

This commit is contained in:
Shauren
2014-10-26 10:34:33 +01:00
parent 9c6f88d31c
commit a231777c50
6 changed files with 52 additions and 52 deletions

View File

@@ -962,17 +962,18 @@ CREATE TABLE `game_event_seasonal_questrelation` (
/*!40101 SET character_set_client = @saved_cs_client */;
--
-- Table structure for table `game_graveyard_zone`
-- Table structure for table `graveyard_zone`
--
DROP TABLE IF EXISTS `game_graveyard_zone`;
DROP TABLE IF EXISTS `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`)
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 */;
@@ -1968,7 +1969,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,
@@ -1977,7 +1978,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 */;
@@ -1989,16 +1990,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 */;
@@ -2316,13 +2317,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 */;
@@ -2370,11 +2371,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 NOT NULL,
`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 */;
@@ -2703,15 +2704,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 NOT NULL,
`VerifiedBuild` smallint(5) DEFAULT '0',
PRIMARY KEY (`entry`)
PRIMARY KEY (`ID`)
) ENGINE=MyISAM DEFAULT CHARSET=utf8;
/*!40101 SET character_set_client = @saved_cs_client */;