diff options
| author | Vincent_Michael <Vincent_Michael@gmx.de> | 2013-03-04 19:09:57 +0100 | 
|---|---|---|
| committer | Vincent_Michael <Vincent_Michael@gmx.de> | 2013-03-04 19:09:57 +0100 | 
| commit | 7ce02e7900c9682a35f77dfa873fefc59b5014d2 (patch) | |
| tree | 295103173d4a2501f39269ff3ae17ea246734712 /sql/base/characters_database.sql | |
| parent | c3767572416f7a22b66d1db8139500bafbe93f61 (diff) | |
| parent | 226e0fdd1b08e315cb7f534b97a7d48e33bbf4fe (diff) | |
Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4
Conflicts:
	src/server/game/Entities/Creature/Creature.h
	src/server/game/Entities/Player/Player.cpp
	src/server/game/Entities/Player/Player.h
	src/server/game/Entities/Unit/Unit.cpp
	src/server/game/Entities/Unit/Unit.h
	src/server/game/Globals/ObjectMgr.cpp
	src/server/game/Handlers/CharacterHandler.cpp
Diffstat (limited to 'sql/base/characters_database.sql')
| -rw-r--r-- | sql/base/characters_database.sql | 1 | 
1 files changed, 1 insertions, 0 deletions
diff --git a/sql/base/characters_database.sql b/sql/base/characters_database.sql index 0f828b08c50..4a11ccb6380 100644 --- a/sql/base/characters_database.sql +++ b/sql/base/characters_database.sql @@ -1001,6 +1001,7 @@ DROP TABLE IF EXISTS `character_queststatus_rewarded`;  CREATE TABLE `character_queststatus_rewarded` (    `guid` int(10) unsigned NOT NULL DEFAULT '0' COMMENT 'Global Unique Identifier',    `quest` int(10) unsigned NOT NULL DEFAULT '0' COMMENT 'Quest Identifier', +  `active` tinyint(10) unsigned NOT NULL DEFAULT '1',    PRIMARY KEY (`guid`,`quest`)  ) ENGINE=InnoDB DEFAULT CHARSET=utf8 COMMENT='Player System';  /*!40101 SET character_set_client = @saved_cs_client */;  | 
