diff options
| author | Nay <dnpd.dd@gmail.com> | 2012-09-09 02:18:58 +0100 |
|---|---|---|
| committer | Nay <dnpd.dd@gmail.com> | 2012-09-09 02:18:58 +0100 |
| commit | 7c4e7a9ebcb41a0d0f34df761409a445d532f965 (patch) | |
| tree | 2cdc29b01092763ec3a05ab5049703e2a437d194 /sql/base/characters_database.sql | |
| parent | c86abc28c2f3a944922d1fcac75805c32dfb7663 (diff) | |
| parent | d04f155b6529e3d86fca931075775fd34b544e29 (diff) | |
Merge remote-tracking branch 'origin/master' into 4.3.4
Conflicts:
sql/base/characters_database.sql
src/server/game/Entities/Player/Player.cpp
src/server/game/Handlers/CharacterHandler.cpp
Diffstat (limited to 'sql/base/characters_database.sql')
| -rw-r--r-- | sql/base/characters_database.sql | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sql/base/characters_database.sql b/sql/base/characters_database.sql index 404ffbb6593..d14c57bdf45 100644 --- a/sql/base/characters_database.sql +++ b/sql/base/characters_database.sql @@ -1220,7 +1220,7 @@ DROP TABLE IF EXISTS `characters`; CREATE TABLE `characters` ( `guid` int(10) unsigned NOT NULL DEFAULT '0' COMMENT 'Global Unique Identifier', `account` int(10) unsigned NOT NULL DEFAULT '0' COMMENT 'Account Identifier', - `name` varchar(12) NOT NULL DEFAULT '', + `name` varchar(12) CHARACTER SET utf8 COLLATE utf8_bin NOT NULL, `slot` tinyint(3) unsigned NOT NULL DEFAULT '0', `race` tinyint(3) unsigned NOT NULL DEFAULT '0', `class` tinyint(3) unsigned NOT NULL DEFAULT '0', @@ -2419,4 +2419,4 @@ UNLOCK TABLES; /*!40101 SET COLLATION_CONNECTION=@OLD_COLLATION_CONNECTION */; /*!40111 SET SQL_NOTES=@OLD_SQL_NOTES */; --- Dump completed on 2012-09-05 18:59:26 +-- Dump completed on 2012-09-08 15:27:29 |