diff options
| author | Vincent_Michael <Vincent_Michael@gmx.de> | 2014-01-13 20:34:21 +0100 |
|---|---|---|
| committer | Vincent_Michael <Vincent_Michael@gmx.de> | 2014-01-13 20:34:21 +0100 |
| commit | cc85d1b5b75fc522b94783c99e212346429bfe4a (patch) | |
| tree | e33b89094e1ca2154381a14ba3b0ad9d61d0a013 /sql/base | |
| parent | a73e8511f923812cd0059cbd66848e7e85cd8441 (diff) | |
| parent | 88ecc9533a2d132d15f222b7b05eeb0f96930e21 (diff) | |
Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4
Conflicts:
src/server/game/Entities/Player/Player.cpp
src/server/game/Spells/SpellMgr.cpp
src/server/scripts/EasternKingdoms/ZulAman/boss_akilzon.cpp
src/server/scripts/World/npcs_special.cpp
src/server/worldserver/worldserver.conf.dist
Diffstat (limited to 'sql/base')
| -rw-r--r-- | sql/base/characters_database.sql | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sql/base/characters_database.sql b/sql/base/characters_database.sql index 424d6fbcd0b..599c05ce4cf 100644 --- a/sql/base/characters_database.sql +++ b/sql/base/characters_database.sql @@ -1746,7 +1746,7 @@ CREATE TABLE `guild` ( `BorderStyle` tinyint(3) unsigned NOT NULL DEFAULT '0', `BorderColor` tinyint(3) unsigned NOT NULL DEFAULT '0', `BackgroundColor` tinyint(3) unsigned NOT NULL DEFAULT '0', - `info` text NOT NULL, + `info` VARCHAR(500) NOT NULL DEFAULT '', `motd` varchar(128) NOT NULL DEFAULT '', `createdate` int(10) unsigned NOT NULL DEFAULT '0', `BankMoney` bigint(20) unsigned NOT NULL DEFAULT '0', |