aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--sql/CMakeLists.txt4
-rw-r--r--sql/characters.sql225
-rw-r--r--sql/realmd.sql2
-rw-r--r--sql/updates/1311_characters.sql1
-rw-r--r--sql/world.sql39
-rw-r--r--sql/world_scripts_structure.sql3
6 files changed, 138 insertions, 136 deletions
diff --git a/sql/CMakeLists.txt b/sql/CMakeLists.txt
index dfdbfd0cf20..d7be8da6962 100644
--- a/sql/CMakeLists.txt
+++ b/sql/CMakeLists.txt
@@ -4,4 +4,6 @@ add_subdirectory(tools)
########### install files ###############
-install(FILES world.sql realmd.sql characters.sql create_mysql.sql world_scripts_full.sql world_scripts_structure.sql drop_mysql.sql DESTINATION share/trinity/sql)
+FILE(GLOB _SQL *.sql)
+
+install(FILES ${_SQL} DESTINATION share/trinity/sql)
diff --git a/sql/characters.sql b/sql/characters.sql
index 82daa2ccd75..a6808fb54b6 100644
--- a/sql/characters.sql
+++ b/sql/characters.sql
@@ -54,7 +54,6 @@ 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',
- `points_to_add` int(10) unsigned NOT NULL default '0',
`personal_rating` int(10) UNSIGNED NOT NULL DEFAULT '0',
) ENGINE=InnoDB DEFAULT CHARSET=utf8;
@@ -226,6 +225,62 @@ LOCK TABLES `bugreport` WRITE;
UNLOCK TABLES;
--
+-- 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',
+ `latency` int(11) 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;
+
+--
-- Table structure for table `character_action`
--
@@ -608,28 +663,6 @@ LOCK TABLES `character_spell_cooldown` WRITE;
UNLOCK TABLES;
--
--- Table structure for table `character_ticket`
---
-
-DROP TABLE IF EXISTS `character_ticket`;
-CREATE TABLE `character_ticket` (
- `ticket_id` int(11) unsigned NOT NULL auto_increment,
- `guid` int(11) unsigned NOT NULL default '0',
- `ticket_text` text,
- `ticket_lastchange` timestamp NOT NULL default CURRENT_TIMESTAMP on update CURRENT_TIMESTAMP,
- PRIMARY KEY (`ticket_id`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8 ROW_FORMAT=DYNAMIC COMMENT='Player System';
-
---
--- Dumping data for table `character_ticket`
---
-
-LOCK TABLES `character_ticket` WRITE;
-/*!40000 ALTER TABLE `character_ticket` DISABLE KEYS */;
-/*!40000 ALTER TABLE `character_ticket` ENABLE KEYS */;
-UNLOCK TABLES;
-
---
-- Table structure for table `character_tutorial`
--
@@ -659,62 +692,6 @@ LOCK TABLES `character_tutorial` WRITE;
UNLOCK TABLES;
--
--- 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',
- `latency` int(11) 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;
-
---
-- Table structure for table `corpse`
--
@@ -799,7 +776,7 @@ CREATE TABLE `gm_tickets` (
`name` varchar(15) NOT NULL,
`message` text NOT NULL,
`timestamp` int(10) NOT NULL default '0',
- `closed` tinyint(1) NOT NULL default '0',
+ `closed` int(10) NOT NULL default '0',
`assignedto` int(10) NOT NULL default '0',
`comment` text NOT NULL,
PRIMARY KEY (`guid`)
@@ -815,6 +792,40 @@ LOCK TABLES `gm_tickets` WRITE;
UNLOCK TABLES;
--
+-- Table structure for table `groups`
+--
+
+DROP TABLE IF EXISTS `groups`;
+CREATE TABLE `groups` (
+ `leaderGuid` int(11) unsigned NOT NULL,
+ `mainTank` int(11) unsigned NOT NULL,
+ `mainAssistant` int(11) unsigned NOT NULL,
+ `lootMethod` tinyint(4) unsigned NOT NULL,
+ `looterGuid` int(11) unsigned NOT NULL,
+ `lootThreshold` tinyint(4) unsigned NOT NULL,
+ `icon1` int(11) unsigned NOT NULL,
+ `icon2` int(11) unsigned NOT NULL,
+ `icon3` int(11) unsigned NOT NULL,
+ `icon4` int(11) unsigned NOT NULL,
+ `icon5` int(11) unsigned NOT NULL,
+ `icon6` int(11) unsigned NOT NULL,
+ `icon7` int(11) unsigned NOT NULL,
+ `icon8` int(11) unsigned NOT NULL,
+ `isRaid` tinyint(1) unsigned NOT NULL,
+ `difficulty` tinyint(3) unsigned NOT NULL default '0',
+ PRIMARY KEY (`leaderGuid`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8 ROW_FORMAT=FIXED COMMENT='Groups';
+
+--
+-- Dumping data for table `groups`
+--
+
+LOCK TABLES `groups` WRITE;
+/*!40000 ALTER TABLE `groups` DISABLE KEYS */;
+/*!40000 ALTER TABLE `groups` ENABLE KEYS */;
+UNLOCK TABLES;
+
+--
-- Table structure for table `group_instance`
--
@@ -859,40 +870,6 @@ LOCK TABLES `group_member` WRITE;
UNLOCK TABLES;
--
--- Table structure for table `groups`
---
-
-DROP TABLE IF EXISTS `groups`;
-CREATE TABLE `groups` (
- `leaderGuid` int(11) unsigned NOT NULL,
- `mainTank` int(11) unsigned NOT NULL,
- `mainAssistant` int(11) unsigned NOT NULL,
- `lootMethod` tinyint(4) unsigned NOT NULL,
- `looterGuid` int(11) unsigned NOT NULL,
- `lootThreshold` tinyint(4) unsigned NOT NULL,
- `icon1` int(11) unsigned NOT NULL,
- `icon2` int(11) unsigned NOT NULL,
- `icon3` int(11) unsigned NOT NULL,
- `icon4` int(11) unsigned NOT NULL,
- `icon5` int(11) unsigned NOT NULL,
- `icon6` int(11) unsigned NOT NULL,
- `icon7` int(11) unsigned NOT NULL,
- `icon8` int(11) unsigned NOT NULL,
- `isRaid` tinyint(1) unsigned NOT NULL,
- `difficulty` tinyint(3) unsigned NOT NULL default '0',
- PRIMARY KEY (`leaderGuid`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8 ROW_FORMAT=FIXED COMMENT='Groups';
-
---
--- Dumping data for table `groups`
---
-
-LOCK TABLES `groups` WRITE;
-/*!40000 ALTER TABLE `groups` DISABLE KEYS */;
-/*!40000 ALTER TABLE `groups` ENABLE KEYS */;
-UNLOCK TABLES;
-
---
-- Table structure for table `guild`
--
@@ -1109,25 +1086,6 @@ LOCK TABLES `guild_rank` WRITE;
UNLOCK TABLES;
--
--- Table structure for table `has_logged_in_before`
---
-
-DROP TABLE IF EXISTS `has_logged_in_before`;
-CREATE TABLE `has_logged_in_before` (
- `guid` int(11) unsigned NOT NULL default '0',
- PRIMARY KEY (`guid`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8 ROW_FORMAT=DYNAMIC COMMENT='ImpConfig check';
-
---
--- Dumping data for table `has_logged_in_before`
---
-
-LOCK TABLES `has_logged_in_before` WRITE;
-/*!40000 ALTER TABLE `has_logged_in_before` DISABLE KEYS */;
-/*!40000 ALTER TABLE `has_logged_in_before` ENABLE KEYS */;
-UNLOCK TABLES;
-
---
-- Table structure for table `instance`
--
@@ -1280,6 +1238,7 @@ CREATE TABLE `pet_aura` (
`caster_guid` bigint(20) unsigned NOT NULL default '0' COMMENT 'Full Global Unique Identifier',
`spell` int(11) unsigned NOT NULL default '0',
`effect_index` int(11) unsigned NOT NULL default '0',
+ `stackcount` int(11) NOT NULL default '1',
`amount` int(11) NOT NULL default '0',
`maxduration` int(11) NOT NULL default '0',
`remaintime` int(11) NOT NULL default '0',
diff --git a/sql/realmd.sql b/sql/realmd.sql
index 3e0b3774145..24875890718 100644
--- a/sql/realmd.sql
+++ b/sql/realmd.sql
@@ -28,7 +28,7 @@ CREATE TABLE `account` (
`sessionkey` longtext,
`v` longtext,
`s` longtext,
- `email` varchar(320) NOT NULL default '',
+ `email` text,
`joindate` timestamp NOT NULL default CURRENT_TIMESTAMP,
`last_ip` varchar(30) NOT NULL default '127.0.0.1',
`failed_logins` int(11) unsigned NOT NULL default '0',
diff --git a/sql/updates/1311_characters.sql b/sql/updates/1311_characters.sql
new file mode 100644
index 00000000000..2ab9c8ecd93
--- /dev/null
+++ b/sql/updates/1311_characters.sql
@@ -0,0 +1 @@
+DROP TABLE IF EXISTS `has_logged_in_before`;
diff --git a/sql/world.sql b/sql/world.sql
index 3ef837af955..50303dcce7e 100644
--- a/sql/world.sql
+++ b/sql/world.sql
@@ -90,7 +90,6 @@ CREATE TABLE `areatrigger_teleport` (
`target_position_z` float NOT NULL default '0',
`target_orientation` float NOT NULL default '0',
PRIMARY KEY (`id`),
- FULLTEXT KEY `name` (`name`)
) ENGINE=MyISAM DEFAULT CHARSET=utf8 ROW_FORMAT=FIXED COMMENT='Trigger System';
--
@@ -1727,6 +1726,41 @@ LOCK TABLES `locales_item` WRITE;
UNLOCK TABLES;
--
+-- Table structure for table `locales_npc_option`
+--
+
+DROP TABLE IF EXISTS `locales_npc_option`;
+CREATE TABLE `locales_npc_option` (
+ `entry` mediumint(8) unsigned NOT NULL default '0',
+ `option_text_loc1` text,
+ `option_text_loc2` text,
+ `option_text_loc3` text,
+ `option_text_loc4` text,
+ `option_text_loc5` text,
+ `option_text_loc6` text,
+ `option_text_loc7` text,
+ `option_text_loc8` text,
+ `box_text_loc1` text,
+ `box_text_loc2` text,
+ `box_text_loc3` text,
+ `box_text_loc4` text,
+ `box_text_loc5` text,
+ `box_text_loc6` text,
+ `box_text_loc7` text,
+ `box_text_loc8` text,
+ PRIMARY KEY (`entry`)
+) ENGINE=MyISAM DEFAULT CHARSET=utf8;
+
+--
+-- Dumping data for table `locales_npc_option`
+--
+
+LOCK TABLES `locales_npc_option` WRITE;
+/*!40000 ALTER TABLE `locales_npc_option` DISABLE KEYS */;
+/*!40000 ALTER TABLE `locales_npc_option` ENABLE KEYS */;
+UNLOCK TABLES;
+
+--
-- Table structure for table `locales_npc_text`
--
@@ -2051,7 +2085,10 @@ CREATE TABLE `npc_option` (
`npcflag` int(10) unsigned NOT NULL default '0',
`icon` tinyint(3) unsigned NOT NULL default '0',
`action` tinyint(3) unsigned NOT NULL default '0',
+ `box_money` int(10) unsigned NOT NULL default '0',
+ `coded` tinyint(3) unsigned NOT NULL default '0',
`option_text` text,
+ `box_text` text,
PRIMARY KEY (`id`)
) ENGINE=MyISAM DEFAULT CHARSET=utf8;
diff --git a/sql/world_scripts_structure.sql b/sql/world_scripts_structure.sql
index aeb1eb6b38c..9ce15a2d1bb 100644
--- a/sql/world_scripts_structure.sql
+++ b/sql/world_scripts_structure.sql
@@ -13,6 +13,7 @@ CREATE TABLE `custom_texts` (
`sound` mediumint(8) unsigned NOT NULL default '0',
`type` tinyint unsigned NOT NULL default '0',
`language` tinyint unsigned NOT NULL default '0',
+ `emote` tinyint(3) unsigned NOT NULL DEFAULT '0',
`comment` text,
PRIMARY KEY (`entry`)
) ENGINE=MyISAM DEFAULT CHARSET=utf8 ROW_FORMAT=FIXED COMMENT='Custom Texts';
@@ -72,6 +73,7 @@ CREATE TABLE `eventai_texts` (
`sound` mediumint(8) unsigned NOT NULL default '0',
`type` tinyint unsigned NOT NULL default '0',
`language` tinyint unsigned NOT NULL default '0',
+ `emote` tinyint(3) unsigned NOT NULL DEFAULT '0',
`comment` text,
PRIMARY KEY (`entry`)
) ENGINE=MyISAM DEFAULT CHARSET=utf8 ROW_FORMAT=FIXED COMMENT='Script Texts';
@@ -91,6 +93,7 @@ CREATE TABLE `script_texts` (
`sound` mediumint(8) unsigned NOT NULL default '0',
`type` tinyint unsigned NOT NULL default '0',
`language` tinyint unsigned NOT NULL default '0',
+ `emote` tinyint(3) unsigned NOT NULL DEFAULT '0',
`comment` text,
PRIMARY KEY (`entry`)
) ENGINE=MyISAM DEFAULT CHARSET=utf8 ROW_FORMAT=FIXED COMMENT='Script Texts';