Merge pull request #15313 from pete318/map_local_guid_335

[3.3.5/Core/Map] map local guids 6.x -> 3.3.5

2 files changed, 19 insertions, 0 deletions

diff --git a/sql/updates/characters/2015_08_26_00_characters_335.sql b/sql/updates/characters/2015_08_26_00_characters_335.sql
new file mode 100644
index 00000000000..1f46c5dd7f7
--- /dev/null
+++ b/sql/updates/characters/2015_08_26_00_characters_335.sql
@@ -0,0 +1,16 @@
+-- Keep only the highest guid PvE or PvP (not bones) corpse per player guid
+DELETE c FROM `corpse` c LEFT JOIN
+(
+    SELECT MAX(`corpseGuid`) AS id
+    FROM `corpse`
+    WHERE `corpseType` IN (1,2)
+    GROUP BY `guid`
+) corpsetemp
+ON c.`corpseGuid` = corpsetemp.`id`
+WHERE corpsetemp.`id` IS NULL;
+
+-- Remove corpseGUID and set key to player guid
+ALTER TABLE `corpse`
+  DROP `corpseGuid`,
+  DROP INDEX `idx_player`,
+  ADD PRIMARY KEY (`guid`);
diff --git a/sql/updates/world/2015_09_11_99_world_335.sql b/sql/updates/world/2015_09_11_99_world_335.sql
new file mode 100644
index 00000000000..2851d4172b7
--- /dev/null
+++ b/sql/updates/world/2015_09_11_99_world_335.sql
@@ -0,0 +1,3 @@
+UPDATE `trinity_string`
+SET `content_default` = 'Object GUID is: %s'
+WHERE `entry`=201;