diff options
| author | Vincent_Michael <Vincent_Michael@gmx.de> | 2014-01-31 23:51:07 +0100 |
|---|---|---|
| committer | Vincent_Michael <Vincent_Michael@gmx.de> | 2014-01-31 23:51:07 +0100 |
| commit | 224da4795283d1314bd255611730a2b46f84f68c (patch) | |
| tree | 9f118a2f9bafcce24ee3fd62057689bbd085d0d6 /sql/base | |
| parent | 9316b947863dcac7675fc9e4cf43a44c4e678ab9 (diff) | |
| parent | 19172ee4c26a12b844a7e1f435daed9bb44bf625 (diff) | |
Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4
Conflicts:
src/server/game/Entities/Player/Player.cpp
src/server/game/Entities/Player/Player.h
src/server/scripts/Spells/spell_dk.cpp
Diffstat (limited to 'sql/base')
| -rw-r--r-- | sql/base/characters_database.sql | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/sql/base/characters_database.sql b/sql/base/characters_database.sql index 599c05ce4cf..b3430b2b5ac 100644 --- a/sql/base/characters_database.sql +++ b/sql/base/characters_database.sql @@ -221,12 +221,12 @@ 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, + `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`) + UNIQUE KEY `idx_name_ver` (`Name`,`Version`) ) ENGINE=InnoDB DEFAULT CHARSET=utf8; /*!40101 SET character_set_client = @saved_cs_client */; @@ -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` VARCHAR(500) NOT NULL DEFAULT '', + `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', @@ -2683,4 +2683,4 @@ UNLOCK TABLES; /*!40101 SET COLLATION_CONNECTION=@OLD_COLLATION_CONNECTION */; /*!40111 SET SQL_NOTES=@OLD_SQL_NOTES */; --- Dump completed on 2013-02-04 16:22:06 +-- Dump completed on 2014-01-26 14:39:20 |