diff options
| author | Spp <spp@jorge.gr> | 2013-05-21 09:41:13 +0200 |
|---|---|---|
| committer | Spp <spp@jorge.gr> | 2013-05-21 09:41:13 +0200 |
| commit | 1b6fb2b6959f504d9e33d2326691cf43a04690d2 (patch) | |
| tree | 31671ddd62612c27e1e821408956b9a8ff52a0ab /sql/base/characters_database.sql | |
| parent | 82dc639882d2d51a8bde9bcd47b773be435a5a12 (diff) | |
| parent | 243c325ca4323feb4f7f80c0ecd3873c78cbf887 (diff) | |
Merge branch 'master' into 4.3.4 [NOTE: There are parts of code marked as "REVIEW - MERGE" That needs some review)
Conflicts:
src/server/game/DataStores/DBCStores.cpp
src/server/game/DataStores/DBCStores.h
src/server/game/DataStores/DBCfmt.h
src/server/game/Entities/Unit/Unit.cpp
src/server/game/Entities/Unit/Unit.h
src/server/game/Handlers/AuctionHouseHandler.cpp
src/server/game/Handlers/GroupHandler.cpp
src/server/game/Movement/Spline/MovementTypedefs.h
src/server/game/Spells/Auras/SpellAuraEffects.cpp
src/server/game/Spells/SpellInfo.cpp
src/server/scripts/EasternKingdoms/ScarletEnclave/chapter1.cpp
src/server/scripts/Spells/spell_generic.cpp
Diffstat (limited to 'sql/base/characters_database.sql')
| -rw-r--r-- | sql/base/characters_database.sql | 26 |
1 files changed, 26 insertions, 0 deletions
diff --git a/sql/base/characters_database.sql b/sql/base/characters_database.sql index e5df0656417..4f698c10288 100644 --- a/sql/base/characters_database.sql +++ b/sql/base/characters_database.sql @@ -214,6 +214,32 @@ LOCK TABLES `auctionhouse` WRITE; UNLOCK TABLES; -- +-- Table structure for table `banned_addons` +-- + +DROP TABLE IF EXISTS `banned_addons`; +/*!40101 SET @saved_cs_client = @@character_set_client */; +/*!40101 SET character_set_client = utf8 */; +CREATE TABLE `banned_addons` ( + `Id` int(10) UNSIGNED NOT NULL AUTO_INCREMENT, + `Name` varchar(255) NOT NULL, + `Version` varchar(255) NOT NULL DEFAULT '', + `Timestamp` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP, + PRIMARY KEY (`Id`), + UNIQUE KEY `idx_name_ver` (`Name`, `Version`) +) ENGINE=InnoDB DEFAULT CHARSET=utf8; +/*!40101 SET character_set_client = @saved_cs_client */; + +-- +-- Dumping data for table `banned_addons` +-- + +LOCK TABLES `banned_addons` WRITE; +/*!40000 ALTER TABLE `banned_addons` DISABLE KEYS */; +/*!40000 ALTER TABLE `banned_addons` ENABLE KEYS */; +UNLOCK TABLES; + +-- -- Table structure for table `bugreport` -- |