aboutsummaryrefslogtreecommitdiff
path: root/sql
diff options
context:
space:
mode:
authorQAston <none@none>2009-04-07 20:40:00 +0200
committerQAston <none@none>2009-04-07 20:40:00 +0200
commit741b51cc471d8a3f897b7ded51e1d3122e3d8300 (patch)
tree3c579933847679c780be6b672e00d636a32690dd /sql
parent26b856a5135f51372cb1b15de21a0e995cdb6435 (diff)
parentc6b6a72956efdc10da8fac982db734b054984d08 (diff)
*Merge
--HG-- branch : trunk
Diffstat (limited to 'sql')
-rw-r--r--sql/characters.sql1
-rw-r--r--sql/updates/2479_world.sql2
2 files changed, 2 insertions, 1 deletions
diff --git a/sql/characters.sql b/sql/characters.sql
index fc9da398cfe..55a8796e6e4 100644
--- a/sql/characters.sql
+++ b/sql/characters.sql
@@ -1413,7 +1413,6 @@ LOCK TABLES `petition_sign` WRITE;
/*!40000 ALTER TABLE `petition_sign` DISABLE KEYS */;
/*!40000 ALTER TABLE `petition_sign` ENABLE KEYS */;
UNLOCK TABLES;
-/*!40103 SET TIME_ZONE=@OLD_TIME_ZONE */;
--
-- Table structure for table `saved_variables`
diff --git a/sql/updates/2479_world.sql b/sql/updates/2479_world.sql
new file mode 100644
index 00000000000..e5f0e2fb772
--- /dev/null
+++ b/sql/updates/2479_world.sql
@@ -0,0 +1,2 @@
+DELETE FROM `trinity_string` WHERE `entry` = 5007;
+INSERT INTO `trinity_string` (`entry`, `content_default`, `content_loc1`, `content_loc2`, `content_loc3`, `content_loc4`, `content_loc5`, `content_loc6`, `content_loc7`, `content_loc8`) VALUES (5007, 'You must be in a raid group to enter this instance.', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL);