aboutsummaryrefslogtreecommitdiff
path: root/sql
diff options
context:
space:
mode:
authormegamage <none@none>2009-03-12 14:22:59 -0600
committermegamage <none@none>2009-03-12 14:22:59 -0600
commit16ee4a46c271bd7c234ffa7579f5f90cf2007772 (patch)
tree6d547d8228472fcc97ead5dfcdd8a9aaf8f70233 /sql
parent6e12d3f1b9f40f3f95390245f3fcbb30fbd8657f (diff)
parent1fbfc6da645058a6da3073dafde0e6bca621e31c (diff)
*Merge.
--HG-- branch : trunk
Diffstat (limited to 'sql')
-rw-r--r--sql/world.sql10
1 files changed, 5 insertions, 5 deletions
diff --git a/sql/world.sql b/sql/world.sql
index 43e66c8110e..9ab43e606bf 100644
--- a/sql/world.sql
+++ b/sql/world.sql
@@ -550,7 +550,7 @@ CREATE TABLE `creature_formations` (
`dist` float unsigned NOT NULL,
`angle` float unsigned NOT NULL,
`groupAI` int(11) unsigned NOT NULL,
- PRIMARY KEY (`follower`));
+ PRIMARY KEY (`memberGUID`));
--
-- Dumping data for table `creature_formations`
@@ -13707,7 +13707,7 @@ CREATE TABLE `transport_events` (
-- Dumping data for table `transport_events`
--
-LOCK TABLES `trinity_string` WRITE;
+LOCK TABLES `transport_events` WRITE;
/*!40000 ALTER TABLE `transport_events` DISABLE KEYS */;
/*!40000 ALTER TABLE `transport_events` ENABLE KEYS */;
UNLOCK TABLES;
@@ -13777,9 +13777,9 @@ CREATE TABLE `waypoint_data` (
-- Dumping data for table `waypoint_data`
--
-LOCK TABLES `waypoint_scripts` WRITE;
-/*!40000 ALTER TABLE `waypoint_scripts` DISABLE KEYS */;
-/*!40000 ALTER TABLE `waypoint_scripts` ENABLE KEYS */;
+LOCK TABLES `waypoint_data` WRITE;
+/*!40000 ALTER TABLE `waypoint_data` DISABLE KEYS */;
+/*!40000 ALTER TABLE `waypoint_data` ENABLE KEYS */;
UNLOCK TABLES;
--