diff options
| author | Spp <spp@jorge.gr> | 2012-11-09 09:03:29 +0100 |
|---|---|---|
| committer | Spp <spp@jorge.gr> | 2012-11-09 09:03:29 +0100 |
| commit | ccf593c6738ad1073381f1c2d404664e8d4ea187 (patch) | |
| tree | aed45faab77812b149be4cfb2384122d7d3a0055 /sql | |
| parent | 35d63a97990528d5496598cc5893be141649f308 (diff) | |
Fix merge conflic and typos in worldserver config file and characters.sql
Diffstat (limited to 'sql')
| -rw-r--r-- | sql/base/characters_database.sql | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/sql/base/characters_database.sql b/sql/base/characters_database.sql index ebbdba293d6..89bc1f13d18 100644 --- a/sql/base/characters_database.sql +++ b/sql/base/characters_database.sql @@ -1975,7 +1975,7 @@ UNLOCK TABLES; DROP TABLE IF EXISTS `guild_newslog`; /*!40101 SET @saved_cs_client = @@character_set_client */; /*!40101 SET character_set_client = utf8 */; -CREATE TABLE `guild_news_log` ( +CREATE TABLE `guild_newslog` ( `guildid` int(10) unsigned NOT NULL DEFAULT '0' COMMENT 'Guild Identificator', `LogGuid` int(10) unsigned NOT NULL DEFAULT '0' COMMENT 'Log record identificator - auxiliary column', `EventType` tinyint(3) unsigned NOT NULL DEFAULT '0' COMMENT 'Event type', @@ -1983,7 +1983,7 @@ CREATE TABLE `guild_news_log` ( `Flags` int(10) unsigned NOT NULL DEFAULT '0', `Value` int(10) unsigned NOT NULL DEFAULT '0', `TimeStamp` int(10) unsigned NOT NULL DEFAULT '0' COMMENT 'Event UNIX time', - PRIMARY KEY (`guildid`,`LogGuid`) + PRIMARY KEY (`guildid`,`LogGuid`), KEY `guildid_key` (`guildid`), KEY `Idx_PlayerGuid` (`PlayerGuid`), KEY `Idx_LogGuid` (`LogGuid`) @@ -1997,6 +1997,7 @@ CREATE TABLE `guild_news_log` ( LOCK TABLES `guild_newslog` WRITE; /*!40000 ALTER TABLE `guild_newslog` DISABLE KEYS */; /*!40000 ALTER TABLE `guild_newslog` ENABLE KEYS */; +UNLOCK TABLES; -- -- Table structure for table `guild_rank` |