diff options
Diffstat (limited to 'sql/characters.sql')
-rw-r--r-- | sql/characters.sql | 65 |
1 files changed, 1 insertions, 64 deletions
diff --git a/sql/characters.sql b/sql/characters.sql index c806d9d83d0..d67c7f02d27 100644 --- a/sql/characters.sql +++ b/sql/characters.sql @@ -25,8 +25,6 @@ CREATE TABLE `saved_variables` ( ) ENGINE=MyISAM DEFAULT CHARSET=utf8 ROW_FORMAT=FIXED COMMENT='Variable Saves'; -- -<<<<<<< HEAD:sql/characters.sql -======= -- Table structure for table `character_db_version` -- @@ -86,11 +84,7 @@ CREATE TABLE `arena_team_member` ( `wons_week` int(10) unsigned NOT NULL default '0', `played_season` int(10) unsigned NOT NULL default '0', `wons_season` int(10) unsigned NOT NULL default '0', -<<<<<<< HEAD:sql/characters.sql - `points_to_add` int(10) unsigned NOT NULL default '0' -======= `personal_rating` int(10) UNSIGNED NOT NULL DEFAULT '0' ->>>>>>> upstream/master:sql/characters.sql ) ENGINE=InnoDB DEFAULT CHARSET=utf8; -- @@ -180,64 +174,6 @@ LOCK TABLES `bugreport` WRITE; UNLOCK TABLES; -- -<<<<<<< HEAD:sql/characters.sql -======= --- Table structure for table `characters` --- - -DROP TABLE IF EXISTS `characters`; -CREATE TABLE `characters` ( - `guid` int(11) unsigned NOT NULL default '0' COMMENT 'Global Unique Identifier', - `account` int(11) unsigned NOT NULL default '0' COMMENT 'Account Identifier', - `data` longtext, - `name` varchar(12) NOT NULL default '', - `race` tinyint(3) unsigned NOT NULL default '0', - `class` tinyint(3) unsigned NOT NULL default '0', - `position_x` float NOT NULL default '0', - `position_y` float NOT NULL default '0', - `position_z` float NOT NULL default '0', - `map` int(11) unsigned NOT NULL default '0' COMMENT 'Map Identifier', - `dungeon_difficulty` tinyint(1) unsigned NOT NULL DEFAULT '0', - `orientation` float NOT NULL default '0', - `taximask` longtext, - `online` tinyint(3) unsigned NOT NULL default '0', - `cinematic` tinyint(3) unsigned NOT NULL default '0', - `totaltime` int(11) unsigned NOT NULL default '0', - `leveltime` int(11) unsigned NOT NULL default '0', - `logout_time` bigint(20) unsigned NOT NULL default '0', - `is_logout_resting` tinyint(3) unsigned NOT NULL default '0', - `rest_bonus` float NOT NULL default '0', - `resettalents_cost` int(11) unsigned NOT NULL default '0', - `resettalents_time` bigint(20) unsigned NOT NULL default '0', - `trans_x` float NOT NULL default '0', - `trans_y` float NOT NULL default '0', - `trans_z` float NOT NULL default '0', - `trans_o` float NOT NULL default '0', - `transguid` bigint(20) unsigned NOT NULL default '0', - `extra_flags` int(11) unsigned NOT NULL default '0', - `stable_slots` tinyint(1) unsigned NOT NULL default '0', - `at_login` int(11) unsigned NOT NULL default '0', - `zone` int(11) unsigned NOT NULL default '0', - `death_expire_time` bigint(20) unsigned NOT NULL default '0', - `taxi_path` text, - `arena_pending_points` int(10) UNSIGNED NOT NULL default '0', - PRIMARY KEY (`guid`), - KEY `idx_account` (`account`), - KEY `idx_online` (`online`), - KEY `idx_name` (`name`) -) ENGINE=InnoDB DEFAULT CHARSET=utf8 ROW_FORMAT=DYNAMIC COMMENT='Player System'; - --- --- Dumping data for table `characters` --- - -LOCK TABLES `characters` WRITE; -/*!40000 ALTER TABLE `characters` DISABLE KEYS */; -/*!40000 ALTER TABLE `characters` ENABLE KEYS */; -UNLOCK TABLES; - --- ->>>>>>> upstream/master:sql/characters.sql -- Table structure for table `character_action` -- @@ -709,6 +645,7 @@ CREATE TABLE `characters` ( `zone` int(11) unsigned NOT NULL default '0', `death_expire_time` bigint(20) unsigned NOT NULL default '0', `taxi_path` text, + `arena_pending_points` int(10) UNSIGNED NOT NULL default '0', `latency` int(11) unsigned NOT NULL default '0', PRIMARY KEY (`guid`), KEY `idx_account` (`account`), |