aboutsummaryrefslogtreecommitdiff
path: root/sql
diff options
context:
space:
mode:
authorkaelima <kaelima@live.se>2012-11-07 16:43:13 +0100
committerkaelima <kaelima@live.se>2012-11-07 16:43:13 +0100
commit68291eed03b44f5659f7f5143ed66b2f0e67e026 (patch)
treed0c6a07ad4ad75fd9382c955226101a0678d85ac /sql
parent677ee02b8ea32aad12bce60db7527c60ef76f164 (diff)
parentbde6b76b2d3279ad50ef132ec0ea4e8629ab19b7 (diff)
Merge git://github.com/TrinityCore/TrinityCore into mmaps
Diffstat (limited to 'sql')
-rw-r--r--sql/base/characters_database.sql43
-rw-r--r--sql/updates/characters/2012_11_02_00_character_misc.sql1
2 files changed, 29 insertions, 15 deletions
diff --git a/sql/base/characters_database.sql b/sql/base/characters_database.sql
index 4a2d2951da3..5548630d2d6 100644
--- a/sql/base/characters_database.sql
+++ b/sql/base/characters_database.sql
@@ -1727,20 +1727,6 @@ CREATE TABLE `guild_member` (
`rank` tinyint(3) unsigned NOT NULL,
`pnote` varchar(31) NOT NULL DEFAULT '',
`offnote` varchar(31) NOT NULL DEFAULT '',
- `BankResetTimeMoney` int(10) unsigned NOT NULL DEFAULT '0',
- `BankRemMoney` int(10) unsigned NOT NULL DEFAULT '0',
- `BankResetTimeTab0` int(10) unsigned NOT NULL DEFAULT '0',
- `BankRemSlotsTab0` int(10) unsigned NOT NULL DEFAULT '0',
- `BankResetTimeTab1` int(10) unsigned NOT NULL DEFAULT '0',
- `BankRemSlotsTab1` int(10) unsigned NOT NULL DEFAULT '0',
- `BankResetTimeTab2` int(10) unsigned NOT NULL DEFAULT '0',
- `BankRemSlotsTab2` int(10) unsigned NOT NULL DEFAULT '0',
- `BankResetTimeTab3` int(10) unsigned NOT NULL DEFAULT '0',
- `BankRemSlotsTab3` int(10) unsigned NOT NULL DEFAULT '0',
- `BankResetTimeTab4` int(10) unsigned NOT NULL DEFAULT '0',
- `BankRemSlotsTab4` int(10) unsigned NOT NULL DEFAULT '0',
- `BankResetTimeTab5` int(10) unsigned NOT NULL DEFAULT '0',
- `BankRemSlotsTab5` int(10) unsigned NOT NULL DEFAULT '0',
UNIQUE KEY `guid_key` (`guid`),
KEY `guildid_key` (`guildid`),
KEY `guildid_rank_key` (`guildid`,`rank`)
@@ -1757,6 +1743,35 @@ LOCK TABLES `guild_member` WRITE;
UNLOCK TABLES;
--
+-- Table structure for table `guild_member_withdraw`
+--
+
+DROP TABLE IF EXISTS `guild_member_withdraw`;
+/*!40101 SET @saved_cs_client = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE IF NOT EXISTS `guild_member_withdraw` (
+ `guid` int(10) unsigned NOT NULL,
+ `tab0` int(10) unsigned NOT NULL DEFAULT '0',
+ `tab1` int(10) unsigned NOT NULL DEFAULT '0',
+ `tab2` int(10) unsigned NOT NULL DEFAULT '0',
+ `tab3` int(10) unsigned NOT NULL DEFAULT '0',
+ `tab4` int(10) unsigned NOT NULL DEFAULT '0',
+ `tab5` int(10) unsigned NOT NULL DEFAULT '0',
+ `money` int(10) unsigned NOT NULL DEFAULT '0',
+ PRIMARY KEY (`guid`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8 COMMENT='Guild Member Daily Withdraws';
+/*!40101 SET character_set_client = @saved_cs_client */;
+
+--
+-- Dumping data for table `guild_member_withdraw`
+--
+
+LOCK TABLES `guild_member_withdraw` WRITE;
+/*!40000 ALTER TABLE `guild_member_withdraw` DISABLE KEYS */;
+/*!40000 ALTER TABLE `guild_member_withdraw` ENABLE KEYS */;
+UNLOCK TABLES;
+
+--
-- Table structure for table `guild_rank`
--
diff --git a/sql/updates/characters/2012_11_02_00_character_misc.sql b/sql/updates/characters/2012_11_02_00_character_misc.sql
index a7613944dc4..9cbbd423bb8 100644
--- a/sql/updates/characters/2012_11_02_00_character_misc.sql
+++ b/sql/updates/characters/2012_11_02_00_character_misc.sql
@@ -27,4 +27,3 @@ ALTER TABLE `guild_member` DROP COLUMN `BankResetTimeTab5`;
DELETE FROM `worldstates` WHERE `entry`=20006;
INSERT INTO `worldstates` (`entry`,`value`,`comment`) VALUES (20006,0, 'Guild daily reset');
-