diff options
Diffstat (limited to 'sql/characters.sql')
| -rw-r--r-- | sql/characters.sql | 25 |
1 files changed, 24 insertions, 1 deletions
diff --git a/sql/characters.sql b/sql/characters.sql index 55a8796e6e4..97d1e744e7c 100644 --- a/sql/characters.sql +++ b/sql/characters.sql @@ -16,6 +16,29 @@ /*!40111 SET @OLD_SQL_NOTES=@@SQL_NOTES, SQL_NOTES=0 */; -- +<<<<<<< HEAD:sql/characters.sql +======= +-- Table structure for table `character_db_version` +-- + +DROP TABLE IF EXISTS `character_db_version`; +CREATE TABLE `character_db_version` ( + `required_7644_01_characters_character_pet` bit(1) default NULL +) ENGINE=MyISAM DEFAULT CHARSET=utf8 ROW_FORMAT=FIXED COMMENT='Last applied sql update to DB'; + +-- +-- Dumping data for table `character_db_version` +-- + +LOCK TABLES `character_db_version` WRITE; +/*!40000 ALTER TABLE `character_db_version` DISABLE KEYS */; +INSERT INTO `character_db_version` VALUES +(NULL); +/*!40000 ALTER TABLE `character_db_version` ENABLE KEYS */; +UNLOCK TABLES; + +-- +>>>>>>> ddfa7199207e499dd233854a75ac3a6216938873:sql/characters.sql -- Table structure for table `account_data` -- @@ -263,7 +286,7 @@ CREATE TABLE `characters` ( `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', + `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', |