Merge remote-tracking branch 'origin/master' into 4.3.4

Conflicts:
	src/server/game/Server/WorldSocket.cpp

4 files changed, 22 insertions, 0 deletions

diff --git a/sql/updates/auth/2013_02_07_00_auth_account.sql b/sql/updates/auth/2013_02_07_00_auth_account.sql
new file mode 100644
index 00000000000..03bdf8cdcd5
--- /dev/null
+++ b/sql/updates/auth/2013_02_07_00_auth_account.sql
@@ -0,0 +1,3 @@
+UPDATE `account` SET `sessionkey`='';
+ALTER TABLE `account`
+CHANGE `sessionkey` `sessionkey` varchar(80) NOT NULL DEFAULT '' COMMENT 'Temporary storage of session key used to pass data from authserver to worldserver' AFTER `sha_pass_hash`;
diff --git a/sql/updates/auth/2013_02_08_00_auth_account.sql b/sql/updates/auth/2013_02_08_00_auth_account.sql
new file mode 100644
index 00000000000..49948781444
--- /dev/null
+++ b/sql/updates/auth/2013_02_08_00_auth_account.sql
@@ -0,0 +1 @@
+ALTER TABLE `account` CHANGE `sessionkey` `sessionkey` varchar(80) NOT NULL DEFAULT '' AFTER `sha_pass_hash`;
diff --git a/sql/updates/world/2013_02_07_00_world_areatrigger_teleport.sql b/sql/updates/world/2013_02_07_00_world_areatrigger_teleport.sql
new file mode 100644
index 00000000000..0b6f3e576b4
--- /dev/null
+++ b/sql/updates/world/2013_02_07_00_world_areatrigger_teleport.sql
@@ -0,0 +1,8 @@
+DELETE FROM `areatrigger_teleport` WHERE `id` IN (2406, 2407, 2408, 2409, 2410, 2411);
+INSERT INTO `areatrigger_teleport` (`id`, `target_map`, `target_position_x`, `target_position_y`, `target_position_z`, `target_orientation`, `name`) VALUES
+(2406, 0, -276.241, 1652.68, 77.5589, 3.14159, 'Shadowfang - South Fall Target'),
+(2407, 0, -276.241, 1652.68, 77.5589, 3.14159, 'Shadowfang - South Fall Target'),
+(2408, 0, -225.34, 1556.53, 93.0454, 4.71239, 'Shadowfang Front Fall Exit Target'),
+(2409, 0, -225.34, 1556.53, 93.0454, 4.71239, 'Shadowfang Front Fall Exit Target'),
+(2410, 0, -181.26, 1580.65, 97.4466, 6.28319, 'Shadowfang - North Fall Target'),
+(2411, 0, -181.26, 1580.65, 97.4466, 6.28319, 'Shadowfang - North Fall Target');
diff --git a/sql/updates/world/2013_02_09_00_world_gameobject.sql b/sql/updates/world/2013_02_09_00_world_gameobject.sql
new file mode 100644
index 00000000000..386ca974e99
--- /dev/null
+++ b/sql/updates/world/2013_02_09_00_world_gameobject.sql
@@ -0,0 +1,10 @@
+SET @GUID = 4522;
+SET @SINK = 300177;
+
+-- spawn TEMP South Sinkhole
+DELETE FROM `gameobject` WHERE `guid`=@GUID AND `id`=@SINK;
+INSERT INTO `gameobject` (`guid`, `id`, `map`, `spawnMask`, `phaseMask`, `position_x`, `position_y`, `position_z`, `orientation`, `rotation0`, `rotation1`, `rotation2`, `rotation3`, `spawntimesecs`, `animprogress`, `state`) VALUES
+(@GUID, @SINK, 571, 1, 1, 3488.48, 4515.98, -20.7394, 5.34436, 0, 0, 0.452361, -0.891835, 300, 0, 1);
+
+-- increase TEMP South Sinkhole spellfocus radius
+UPDATE `gameobject_template` SET `data1`=20 WHERE `entry`=@SINK;