11 files changed, 45 insertions, 11 deletions
diff --git a/sql/updates/3901_world_spell_proc_event.sql b/sql/updates/3903_world_spell_proc_event.sql
index ab534ece0a8..4f333311d2d 100644
--- a/sql/updates/3901_world_spell_proc_event.sql
+++ b/sql/updates/3903_world_spell_proc_event.sql
@@ -1,3 +1,3 @@
 DELETE FROM `spell_proc_event` WHERE `entry` IN (56249);
 INSERT INTO `spell_proc_event` (`entry`, `SchoolMask`, `SpellFamilyName`, `SpellFamilyMask0`, `SpellFamilyMask1`, `SpellFamilyMask2`, `procFlags`, `procEx`, `ppmRate`, `CustomChance`, `Cooldown`) VALUES
-(56249,	0x00,	5,	0x00000000,	0x00000000,	0x00000400,	0x00000000,	0x00000000,	0,	0,	0); -- Glyph of Felhunter
+(56249,	0x00,	5,	0x00000000,	0x00000000,	0x00000400,	0x00000000,	0x00000000,	0,	0,	0); -- Glyph of Felhunter
+\ No newline at end of file
diff --git a/sql/updates/3968_world_spell_proc_event.sql b/sql/updates/3969_world_spell_proc_event.sql
index bca25a6ebe0..fcefd99dbd9 100644
--- a/sql/updates/3968_world_spell_proc_event.sql
+++ b/sql/updates/3969_world_spell_proc_event.sql
@@ -39,4 +39,4 @@ INSERT INTO `spell_proc_event`(`entry`, `SchoolMask`, `SpellFamilyName`, `SpellF
 (33297, 0x00, 0, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0, 0, 45), -- Quagmirrans Eye
 (38299, 0x00, 0, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0, 0, 15), -- Fel Reavers Piston
 (59630, 0x00, 0, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0, 0, 45), -- Black Magic
-(61356, 0x00, 0, 0x00000000, 0x00000000, 0x00000000, 0x000002A8, 0x00000002, 0, 0, 90); -- Invigorating Earthsiege Diamond
+(61356, 0x00, 0, 0x00000000, 0x00000000, 0x00000000, 0x000002A8, 0x00000002, 0, 0, 90); -- Invigorating Earthsiege Diamond
+\ No newline at end of file
diff --git a/sql/updates/4000_world_spell_proc_event.sql b/sql/updates/4002_world_spell_proc_event.sql
index d426dc437cb..cec219053e3 100644
--- a/sql/updates/4000_world_spell_proc_event.sql
+++ b/sql/updates/4002_world_spell_proc_event.sql
@@ -5,4 +5,4 @@ INSERT INTO `spell_proc_event` (`entry`, `SchoolMask`, `SpellFamilyName`, `Spell
 ( 50885, 0x00,  15, 0x00000000, 0x04000000, 0x00000000, 0x00000000, 0x00000000,   0,   0,   0), -- Icy Talons
 ( 50886, 0x00,  15, 0x00000000, 0x04000000, 0x00000000, 0x00000000, 0x00000000,   0,   0,   0), -- Icy Talons
 ( 50887, 0x00,  15, 0x00000000, 0x04000000, 0x00000000, 0x00000000, 0x00000000,   0,   0,   0), -- Icy Talons
-( 55610, 0x00,  15, 0x00000000, 0x04000000, 0x00000000, 0x00000000, 0x00000000,   0,   0,   0); -- Improved Icy Talons
+( 55610, 0x00,  15, 0x00000000, 0x04000000, 0x00000000, 0x00000000, 0x00000000,   0,   0,   0); -- Improved Icy Talons
+\ No newline at end of file
diff --git a/sql/updates/4209_characters_TDB.sql b/sql/updates/4209_characters_TDB.sql
new file mode 100644
index 00000000000..323c5eb69ee
--- /dev/null
+++ b/sql/updates/4209_characters_TDB.sql
@@ -0,0 +1 @@
+ALTER TABLE character_pet DROP COLUMN load_flags;
+\ No newline at end of file
diff --git a/sql/updates/4210_world_TDB.sql b/sql/updates/4209_world_TDB.sql
index 6baca035d85..139655550f7 100644
--- a/sql/updates/4210_world_TDB.sql
+++ b/sql/updates/4209_world_TDB.sql
@@ -2,4 +2,4 @@ DELETE FROM trinity_string WHERE `entry` = 6616;
 DELETE FROM `command` WHERE `name` IN ('reset all','reset talents');
 INSERT INTO `command` VALUES
 ('reset all',3,'Syntax: .reset all spells\r\n\r\nSyntax: .reset all talents\r\n\r\nRequest reset spells or talents (including talents for all character\'s pets if any) at next login each existed character.'),
-('reset talents',3,'Syntax: .reset talents [Playername]\r\n  Removes all talents of the targeted player or pet or named player. Playername can be name of offline character. With player talents also will be reset talents for all character\'s pets if any.');
+('reset talents',3,'Syntax: .reset talents [Playername]\r\n  Removes all talents of the targeted player or pet or named player. Playername can be name of offline character. With player talents also will be reset talents for all character\'s pets if any.');
+\ No newline at end of file
diff --git a/sql/updates/4210_characters_TDB.sql b/sql/updates/4210_characters_TDB.sql
deleted file mode 100644
index a380d2a9e8a..00000000000
--- a/sql/updates/4210_characters_TDB.sql
+++ /dev/null
@@ -1 +0,0 @@
-ALTER TABLE character_pet DROP COLUMN load_flags;
diff --git a/sql/updates/4212_world.sql b/sql/updates/4211_world.sql
index ce4b8d56e86..67378358b0e 100644
--- a/sql/updates/4212_world.sql
+++ b/sql/updates/4211_world.sql
@@ -1,3 +1,2 @@
 ALTER TABLE spell_pet_auras ADD effectId TINYINT( 3 ) UNSIGNED NOT NULL AFTER spell;
-ALTER TABLE spell_pet_auras DROP PRIMARY KEY, ADD PRIMARY KEY(spell,effectId,pet);
-
+ALTER TABLE spell_pet_auras DROP PRIMARY KEY, ADD PRIMARY KEY(spell,effectId,pet);
+\ No newline at end of file
diff --git a/sql/updates/4215_world.sql b/sql/updates/4216_world.sql
index 352596306a0..a3e7a29ca7c 100644
--- a/sql/updates/4215_world.sql
+++ b/sql/updates/4216_world.sql
@@ -1,4 +1,3 @@
 DELETE FROM `command` WHERE `name` IN ('modify tp');
- 
 INSERT INTO `command` VALUES
-('modify tp',1,'Syntax: .modify tp #amount\r\n\r\nSte free talent pointes for selected character or character\'s pet. It will be reset to default expected at next levelup/login/quest reward.');
+('modify tp',1,'Syntax: .modify tp #amount\r\n\r\nSte free talent pointes for selected character or character\'s pet. It will be reset to default expected at next levelup/login/quest reward.');
+\ No newline at end of file
diff --git a/sql/updates/4216_world_spell_proc_event.sql b/sql/updates/4217_world_spell_proc_event.sql
index 00df39c15e2..5bc4733d8aa 100644
--- a/sql/updates/4216_world_spell_proc_event.sql
+++ b/sql/updates/4217_world_spell_proc_event.sql
@@ -1 +1 @@
-DELETE FROM `spell_proc_event` WHERE `entry` IN (13165 ,14318, 14319, 14320, 14321, 14322, 25296, 27044, 61846, 61847);
+DELETE FROM `spell_proc_event` WHERE `entry` IN (13165 ,14318, 14319, 14320, 14321, 14322, 25296, 27044, 61846, 61847);
+\ No newline at end of file
diff --git a/sql/updates/4282_world_TDB.sql b/sql/updates/4283_world_TDB.sql
index f17f0a489f8..38a832dce7c 100644
--- a/sql/updates/4282_world_TDB.sql
+++ b/sql/updates/4283_world_TDB.sql
@@ -79,4 +79,4 @@ INSERT INTO `pet_levelstats` (`creature_entry`, `level`, `hp`, `mana`, `armor`,
 ('26125','77','4380','2056','4342','172','92','89','96','84'),
 ('26125','78','4437','2082','4399','174','93','90','97','85'),
 ('26125','79','4494','2108','4456','176','94','91','98','86'),
-('26125','80','4551','2134','4513','178','95','92','99','87');
+('26125','80','4551','2134','4513','178','95','92','99','87');
+\ No newline at end of file
diff --git a/sql/updates/4321_world.sql b/sql/updates/4321_world.sql
new file mode 100644
index 00000000000..16c2fe33041
--- /dev/null
+++ b/sql/updates/4321_world.sql
@@ -0,0 +1,36 @@
+DELETE FROM `creature_questrelation` WHERE `quest`=12701;
+INSERT INTO `creature_questrelation` (`id`, `quest`) VALUES (28377, 12701);
+DELETE FROM `creature_involvedrelation` WHERE `quest`=12701;
+INSERT INTO `creature_involvedrelation` (`id`, `quest`) VALUES (28377, 12701);
+DELETE FROM `creature_involvedrelation` WHERE `quest`=12723;
+INSERT INTO `creature_involvedrelation` (`id`, `quest`) VALUES (28914, 12723);
+DELETE FROM `creature_questrelation` WHERE `quest`=12724;
+INSERT INTO `creature_questrelation` (`id`, `quest`) VALUES (28914, 12724);
+DELETE FROM `creature_involvedrelation` WHERE `quest`=12724;
+INSERT INTO `creature_involvedrelation` (`id`, `quest`) VALUES (28914, 12724);
+DELETE FROM `creature_questrelation` WHERE `quest`=12725;
+INSERT INTO `creature_questrelation` (`id`, `quest`) VALUES (28913, 12725);
+DELETE FROM `creature_involvedrelation` WHERE `quest`=12725;
+INSERT INTO `creature_involvedrelation` (`id`, `quest`) VALUES (28912, 12725);
+DELETE FROM `creature_questrelation` WHERE `quest`=12727;
+INSERT INTO `creature_questrelation` (`id`, `quest`) VALUES (28912, 12727);
+DELETE FROM `creature_involvedrelation` WHERE `quest`=12727;
+INSERT INTO `creature_involvedrelation` (`id`, `quest`) VALUES (28913, 12727);
+
+DELETE FROM `spell_script_target` WHERE `entry` IN (48714,57806);
+INSERT INTO `spell_script_target` (`entry`, `type`, `targetEntry`) VALUES 
+('48714', '2', '27237'),
+('48714', '2', '27235'),
+('48714', '2', '27234'),
+('48714', '2', '27236'),
+('57806', '2', '31043');
+
+UPDATE `creature_template` SET `ScriptName`='npc_aged_dying_ancient_kodo' WHERE `entry` IN (4700,4701,4702,11627);
+
+DELETE FROM `spell_target_position` WHERE `id`=51852;
+INSERT INTO `spell_target_position` (`id`, `target_map`, `target_position_x`, `target_position_y`, `target_position_z`, `target_orientation`) VALUES
+(51852, 609, 2361.21, -5660.45, 503.828, 4.49);
+
+DELETE FROM `spell_bonus_data` WHERE `entry` IN (20187);
+INSERT INTO `spell_bonus_data` (entry, direct_bonus, dot_bonus, ap_bonus, comments) VALUES
+(20187, 0.4, 0, 0.25, 'Judgement of Righteousness');
+\ No newline at end of file