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

Conflicts:
	sql/old/3.3.5a/2012_08_06_00_world_command.sql
	sql/old/3.3.5a/2012_08_07_00_characters_characters.sql
	sql/old/4.3.4/2012_08_06_00_world_command_434.sql
	sql/updates/characters/2012_08_07_00_characters_characters.sql
	sql/updates/characters/2012_08_07_00_characters_characters_434.sql
	sql/updates/world/2012_08_06_00_world_command.sql

96 files changed, 1 insertions, 0 deletions

diff --git a/sql/updates/characters/2012_06_13_00_characters_character_equipmentsets.sql b/sql/old/3.3.5a/2012_06_13_00_characters_character_equipmentsets.sql
index ebf12062be3..ebf12062be3 100644
--- a/sql/updates/characters/2012_06_13_00_characters_character_equipmentsets.sql
+++ b/sql/old/3.3.5a/2012_06_13_00_characters_character_equipmentsets.sql
diff --git a/sql/updates/auth/2012_08_06_00_auth_logs.sql b/sql/old/3.3.5a/2012_08_06_00_auth_logs.sql
index 04e90e7d208..04e90e7d208 100644
--- a/sql/updates/auth/2012_08_06_00_auth_logs.sql
+++ b/sql/old/3.3.5a/2012_08_06_00_auth_logs.sql
diff --git a/sql/updates/world/2012_08_16_00_world_creature_template.sql b/sql/old/3.3.5a/2012_08_16_00_world_creature_template.sql
index 732f647d7b7..732f647d7b7 100644
--- a/sql/updates/world/2012_08_16_00_world_creature_template.sql
+++ b/sql/old/3.3.5a/2012_08_16_00_world_creature_template.sql
diff --git a/sql/updates/world/2012_08_16_00_world_spell_dbc.sql b/sql/old/3.3.5a/2012_08_16_00_world_spell_dbc.sql
index 248674d17a5..248674d17a5 100644
--- a/sql/updates/world/2012_08_16_00_world_spell_dbc.sql
+++ b/sql/old/3.3.5a/2012_08_16_00_world_spell_dbc.sql
diff --git a/sql/updates/world/2012_08_17_00_world_spell_dbc.sql b/sql/old/3.3.5a/2012_08_17_00_world_spell_dbc.sql
index ee6d2d2f3b6..ee6d2d2f3b6 100644
--- a/sql/updates/world/2012_08_17_00_world_spell_dbc.sql
+++ b/sql/old/3.3.5a/2012_08_17_00_world_spell_dbc.sql
diff --git a/sql/updates/world/2012_08_19_00_world_pickpocketing_loot_template.sql b/sql/old/3.3.5a/2012_08_19_00_world_pickpocketing_loot_template.sql
index 773ad9b6ebc..773ad9b6ebc 100644
--- a/sql/updates/world/2012_08_19_00_world_pickpocketing_loot_template.sql
+++ b/sql/old/3.3.5a/2012_08_19_00_world_pickpocketing_loot_template.sql
diff --git a/sql/updates/world/2012_08_19_01_world_spell_dbc.sql b/sql/old/3.3.5a/2012_08_19_01_world_spell_dbc.sql
index 69a9c2a8336..69a9c2a8336 100644
--- a/sql/updates/world/2012_08_19_01_world_spell_dbc.sql
+++ b/sql/old/3.3.5a/2012_08_19_01_world_spell_dbc.sql
diff --git a/sql/updates/world/2012_08_20_00_world_spell_script_names.sql b/sql/old/3.3.5a/2012_08_20_00_world_spell_script_names.sql
index d0aa185ea3a..d0aa185ea3a 100644
--- a/sql/updates/world/2012_08_20_00_world_spell_script_names.sql
+++ b/sql/old/3.3.5a/2012_08_20_00_world_spell_script_names.sql
diff --git a/sql/updates/world/2012_08_20_01_world_wintergrasp_conditions.sql b/sql/old/3.3.5a/2012_08_20_01_world_wintergrasp_conditions.sql
index c97c753afa8..c97c753afa8 100644
--- a/sql/updates/world/2012_08_20_01_world_wintergrasp_conditions.sql
+++ b/sql/old/3.3.5a/2012_08_20_01_world_wintergrasp_conditions.sql
diff --git a/sql/updates/world/2012_08_20_02_world_wintergrasp_creatures.sql b/sql/old/3.3.5a/2012_08_20_02_world_wintergrasp_creatures.sql
index 1e75f37d32f..1e75f37d32f 100644
--- a/sql/updates/world/2012_08_20_02_world_wintergrasp_creatures.sql
+++ b/sql/old/3.3.5a/2012_08_20_02_world_wintergrasp_creatures.sql
diff --git a/sql/updates/world/2012_08_20_03_world_wintergrasp_gameobjects.sql b/sql/old/3.3.5a/2012_08_20_03_world_wintergrasp_gameobjects.sql
index c309bf1d9dd..c309bf1d9dd 100644
--- a/sql/updates/world/2012_08_20_03_world_wintergrasp_gameobjects.sql
+++ b/sql/old/3.3.5a/2012_08_20_03_world_wintergrasp_gameobjects.sql
diff --git a/sql/updates/world/2012_08_20_04_world_wintergrasp_gossips.sql b/sql/old/3.3.5a/2012_08_20_04_world_wintergrasp_gossips.sql
index 87b96b765a6..87b96b765a6 100644
--- a/sql/updates/world/2012_08_20_04_world_wintergrasp_gossips.sql
+++ b/sql/old/3.3.5a/2012_08_20_04_world_wintergrasp_gossips.sql
diff --git a/sql/updates/world/2012_08_20_05_world_wintergrasp_quests.sql b/sql/old/3.3.5a/2012_08_20_05_world_wintergrasp_quests.sql
index d456f5d5e71..d456f5d5e71 100644
--- a/sql/updates/world/2012_08_20_05_world_wintergrasp_quests.sql
+++ b/sql/old/3.3.5a/2012_08_20_05_world_wintergrasp_quests.sql
diff --git a/sql/updates/world/2012_08_20_06_world_wintergrasp_spells.sql b/sql/old/3.3.5a/2012_08_20_06_world_wintergrasp_spells.sql
index cb2bd219e40..cb2bd219e40 100644
--- a/sql/updates/world/2012_08_20_06_world_wintergrasp_spells.sql
+++ b/sql/old/3.3.5a/2012_08_20_06_world_wintergrasp_spells.sql
diff --git a/sql/updates/world/2012_08_20_07_world_wintergrasp_texts.sql b/sql/old/3.3.5a/2012_08_20_07_world_wintergrasp_texts.sql
index 090c5350c74..090c5350c74 100644
--- a/sql/updates/world/2012_08_20_07_world_wintergrasp_texts.sql
+++ b/sql/old/3.3.5a/2012_08_20_07_world_wintergrasp_texts.sql
diff --git a/sql/updates/world/2012_08_20_08_world_achievement_criteria_data.sql b/sql/old/3.3.5a/2012_08_20_08_world_achievement_criteria_data.sql
index fa995e7804f..fa995e7804f 100644
--- a/sql/updates/world/2012_08_20_08_world_achievement_criteria_data.sql
+++ b/sql/old/3.3.5a/2012_08_20_08_world_achievement_criteria_data.sql
diff --git a/sql/updates/world/2012_08_20_09_world_disables.sql b/sql/old/3.3.5a/2012_08_20_09_world_disables.sql
index fa5010b669f..fa5010b669f 100644
--- a/sql/updates/world/2012_08_20_09_world_disables.sql
+++ b/sql/old/3.3.5a/2012_08_20_09_world_disables.sql
diff --git a/sql/updates/world/2012_08_21_00_world_spell_proc_event.sql b/sql/old/3.3.5a/2012_08_21_00_world_spell_proc_event.sql
index e1a8b59acae..e1a8b59acae 100644
--- a/sql/updates/world/2012_08_21_00_world_spell_proc_event.sql
+++ b/sql/old/3.3.5a/2012_08_21_00_world_spell_proc_event.sql
diff --git a/sql/updates/world/2012_08_21_01_world_command.sql b/sql/old/3.3.5a/2012_08_21_01_world_command.sql
index df833d2d246..df833d2d246 100644
--- a/sql/updates/world/2012_08_21_01_world_command.sql
+++ b/sql/old/3.3.5a/2012_08_21_01_world_command.sql
diff --git a/sql/updates/world/2012_08_21_02_world_wintergrasp_conditions.sql b/sql/old/3.3.5a/2012_08_21_02_world_wintergrasp_conditions.sql
index caf8a0cc1e4..caf8a0cc1e4 100644
--- a/sql/updates/world/2012_08_21_02_world_wintergrasp_conditions.sql
+++ b/sql/old/3.3.5a/2012_08_21_02_world_wintergrasp_conditions.sql
diff --git a/sql/updates/world/2012_08_23_00_world_wintergrasp_spell_script_names.sql b/sql/old/3.3.5a/2012_08_23_00_world_wintergrasp_spell_script_names.sql
index a3dbf81d425..a3dbf81d425 100644
--- a/sql/updates/world/2012_08_23_00_world_wintergrasp_spell_script_names.sql
+++ b/sql/old/3.3.5a/2012_08_23_00_world_wintergrasp_spell_script_names.sql
diff --git a/sql/updates/world/2012_08_23_01_world_wintergrasp_gameobject.sql b/sql/old/3.3.5a/2012_08_23_01_world_wintergrasp_gameobject.sql
index 27f7b4027f1..27f7b4027f1 100644
--- a/sql/updates/world/2012_08_23_01_world_wintergrasp_gameobject.sql
+++ b/sql/old/3.3.5a/2012_08_23_01_world_wintergrasp_gameobject.sql
diff --git a/sql/updates/world/2012_08_25_00_world_creature_template.sql b/sql/old/3.3.5a/2012_08_25_00_world_creature_template.sql
index f7ec4c87fb9..f7ec4c87fb9 100644
--- a/sql/updates/world/2012_08_25_00_world_creature_template.sql
+++ b/sql/old/3.3.5a/2012_08_25_00_world_creature_template.sql
diff --git a/sql/updates/world/2012_08_25_01_world_creature_template.sql b/sql/old/3.3.5a/2012_08_25_01_world_creature_template.sql
index ef8e5bdd8fc..ef8e5bdd8fc 100644
--- a/sql/updates/world/2012_08_25_01_world_creature_template.sql
+++ b/sql/old/3.3.5a/2012_08_25_01_world_creature_template.sql
diff --git a/sql/updates/world/2012_08_26_00_world_conditions.sql b/sql/old/3.3.5a/2012_08_26_00_world_conditions.sql
index c33d9bfc878..c33d9bfc878 100644
--- a/sql/updates/world/2012_08_26_00_world_conditions.sql
+++ b/sql/old/3.3.5a/2012_08_26_00_world_conditions.sql
diff --git a/sql/updates/world/2012_08_26_01_world_creature.sql b/sql/old/3.3.5a/2012_08_26_01_world_creature.sql
index af14886850d..af14886850d 100644
--- a/sql/updates/world/2012_08_26_01_world_creature.sql
+++ b/sql/old/3.3.5a/2012_08_26_01_world_creature.sql
diff --git a/sql/updates/world/2012_08_26_02_world_spell_area.sql b/sql/old/3.3.5a/2012_08_26_02_world_spell_area.sql
index c4eae68e3c4..c4eae68e3c4 100644
--- a/sql/updates/world/2012_08_26_02_world_spell_area.sql
+++ b/sql/old/3.3.5a/2012_08_26_02_world_spell_area.sql
diff --git a/sql/updates/world/2012_08_26_03_world_spell_area.sql b/sql/old/3.3.5a/2012_08_26_03_world_spell_area.sql
index 65072d2b4a7..65072d2b4a7 100644
--- a/sql/updates/world/2012_08_26_03_world_spell_area.sql
+++ b/sql/old/3.3.5a/2012_08_26_03_world_spell_area.sql
diff --git a/sql/updates/world/2012_08_27_00_world_creature_template.sql b/sql/old/3.3.5a/2012_08_27_00_world_creature_template.sql
index 804d7b5c61d..804d7b5c61d 100644
--- a/sql/updates/world/2012_08_27_00_world_creature_template.sql
+++ b/sql/old/3.3.5a/2012_08_27_00_world_creature_template.sql
diff --git a/sql/updates/world/2012_08_27_00_world_spell_script_name.sql b/sql/old/3.3.5a/2012_08_27_00_world_spell_script_name.sql
index 1d036df0a65..1d036df0a65 100644
--- a/sql/updates/world/2012_08_27_00_world_spell_script_name.sql
+++ b/sql/old/3.3.5a/2012_08_27_00_world_spell_script_name.sql
diff --git a/sql/updates/world/2012_08_27_01_world_sai.sql b/sql/old/3.3.5a/2012_08_27_01_world_sai.sql
index 302c3ac1942..302c3ac1942 100644
--- a/sql/updates/world/2012_08_27_01_world_sai.sql
+++ b/sql/old/3.3.5a/2012_08_27_01_world_sai.sql
diff --git a/sql/updates/world/2012_08_27_02_world_creature.sql b/sql/old/3.3.5a/2012_08_27_02_world_creature.sql
index 3595ea7b576..3595ea7b576 100644
--- a/sql/updates/world/2012_08_27_02_world_creature.sql
+++ b/sql/old/3.3.5a/2012_08_27_02_world_creature.sql
diff --git a/sql/updates/world/2012_08_27_02_world_playercreateinfo_spell.sql b/sql/old/3.3.5a/2012_08_27_02_world_playercreateinfo_spell.sql
index 9c664142bba..9c664142bba 100644
--- a/sql/updates/world/2012_08_27_02_world_playercreateinfo_spell.sql
+++ b/sql/old/3.3.5a/2012_08_27_02_world_playercreateinfo_spell.sql
diff --git a/sql/updates/world/2012_08_27_03_world_gameobject.sql b/sql/old/3.3.5a/2012_08_27_03_world_gameobject.sql
index 1bf836c96e0..1bf836c96e0 100644
--- a/sql/updates/world/2012_08_27_03_world_gameobject.sql
+++ b/sql/old/3.3.5a/2012_08_27_03_world_gameobject.sql
diff --git a/sql/updates/world/2012_08_27_04_world_quest_template.sql b/sql/old/3.3.5a/2012_08_27_04_world_quest_template.sql
index 9169a6e5862..9169a6e5862 100644
--- a/sql/updates/world/2012_08_27_04_world_quest_template.sql
+++ b/sql/old/3.3.5a/2012_08_27_04_world_quest_template.sql
diff --git a/sql/updates/world/2012_08_27_05_world_sai.sql b/sql/old/3.3.5a/2012_08_27_05_world_sai.sql
index 3da0143e6e6..3da0143e6e6 100644
--- a/sql/updates/world/2012_08_27_05_world_sai.sql
+++ b/sql/old/3.3.5a/2012_08_27_05_world_sai.sql
diff --git a/sql/updates/world/2012_08_27_06_world_sai.sql b/sql/old/3.3.5a/2012_08_27_06_world_sai.sql
index 8b1aafd1558..8b1aafd1558 100644
--- a/sql/updates/world/2012_08_27_06_world_sai.sql
+++ b/sql/old/3.3.5a/2012_08_27_06_world_sai.sql
diff --git a/sql/updates/world/2012_08_27_07_world_spell_area.sql b/sql/old/3.3.5a/2012_08_27_07_world_spell_area.sql
index 18be6ff0dbe..18be6ff0dbe 100644
--- a/sql/updates/world/2012_08_27_07_world_spell_area.sql
+++ b/sql/old/3.3.5a/2012_08_27_07_world_spell_area.sql
diff --git a/sql/updates/world/2012_08_27_08_world_misc.sql b/sql/old/3.3.5a/2012_08_27_08_world_misc.sql
index 62a57cd42de..62a57cd42de 100644
--- a/sql/updates/world/2012_08_27_08_world_misc.sql
+++ b/sql/old/3.3.5a/2012_08_27_08_world_misc.sql
diff --git a/sql/updates/world/2012_08_27_09_world_conditions.sql b/sql/old/3.3.5a/2012_08_27_09_world_conditions.sql
index 6d536859060..6d536859060 100644
--- a/sql/updates/world/2012_08_27_09_world_conditions.sql
+++ b/sql/old/3.3.5a/2012_08_27_09_world_conditions.sql
diff --git a/sql/updates/world/2012_08_27_10_world_spell_script_names.sql b/sql/old/3.3.5a/2012_08_27_10_world_spell_script_names.sql
index 9ffb153f498..9ffb153f498 100644
--- a/sql/updates/world/2012_08_27_10_world_spell_script_names.sql
+++ b/sql/old/3.3.5a/2012_08_27_10_world_spell_script_names.sql
diff --git a/sql/updates/world/2012_08_28_00_world_spell_script_name.sql b/sql/old/3.3.5a/2012_08_28_00_world_spell_script_name.sql
index 01cfeb35f1f..01cfeb35f1f 100644
--- a/sql/updates/world/2012_08_28_00_world_spell_script_name.sql
+++ b/sql/old/3.3.5a/2012_08_28_00_world_spell_script_name.sql
diff --git a/sql/updates/world/2012_08_28_01_world_achievement_criteria_data.sql b/sql/old/3.3.5a/2012_08_28_01_world_achievement_criteria_data.sql
index bf247399553..bf247399553 100644
--- a/sql/updates/world/2012_08_28_01_world_achievement_criteria_data.sql
+++ b/sql/old/3.3.5a/2012_08_28_01_world_achievement_criteria_data.sql
diff --git a/sql/updates/world/2012_08_29_00_world_blood_furnace.sql b/sql/old/3.3.5a/2012_08_29_00_world_blood_furnace.sql
index 85b493da202..85b493da202 100644
--- a/sql/updates/world/2012_08_29_00_world_blood_furnace.sql
+++ b/sql/old/3.3.5a/2012_08_29_00_world_blood_furnace.sql
diff --git a/sql/updates/world/2012_08_30_00_world_creature_template.sql b/sql/old/3.3.5a/2012_08_30_00_world_creature_template.sql
index 27c1c1dedd4..27c1c1dedd4 100644
--- a/sql/updates/world/2012_08_30_00_world_creature_template.sql
+++ b/sql/old/3.3.5a/2012_08_30_00_world_creature_template.sql
diff --git a/sql/updates/world/2012_08_30_00_world_spell_script_names.sql b/sql/old/3.3.5a/2012_08_30_00_world_spell_script_names.sql
index d7602dd8c79..d7602dd8c79 100644
--- a/sql/updates/world/2012_08_30_00_world_spell_script_names.sql
+++ b/sql/old/3.3.5a/2012_08_30_00_world_spell_script_names.sql
diff --git a/sql/updates/world/2012_08_31_00_world_command.sql b/sql/old/3.3.5a/2012_08_31_00_world_command.sql
index c0686d6d907..c0686d6d907 100644
--- a/sql/updates/world/2012_08_31_00_world_command.sql
+++ b/sql/old/3.3.5a/2012_08_31_00_world_command.sql
diff --git a/sql/updates/world/2012_08_31_00_world_sai.sql b/sql/old/3.3.5a/2012_08_31_00_world_sai.sql
index fd7e0d7810f..fd7e0d7810f 100644
--- a/sql/updates/world/2012_08_31_00_world_sai.sql
+++ b/sql/old/3.3.5a/2012_08_31_00_world_sai.sql
diff --git a/sql/updates/world/2012_09_01_00_world_spell_script_names.sql b/sql/old/3.3.5a/2012_09_01_00_world_spell_script_names.sql
index add7621b74c..add7621b74c 100644
--- a/sql/updates/world/2012_09_01_00_world_spell_script_names.sql
+++ b/sql/old/3.3.5a/2012_09_01_00_world_spell_script_names.sql
diff --git a/sql/updates/world/2012_09_02_00_world_quest_template.sql b/sql/old/3.3.5a/2012_09_02_00_world_quest_template.sql
index d7e3948ef4f..d7e3948ef4f 100644
--- a/sql/updates/world/2012_09_02_00_world_quest_template.sql
+++ b/sql/old/3.3.5a/2012_09_02_00_world_quest_template.sql
diff --git a/sql/updates/world/2012_09_02_01_world_sai.sql b/sql/old/3.3.5a/2012_09_02_01_world_sai.sql
index 971c50d9c05..971c50d9c05 100644
--- a/sql/updates/world/2012_09_02_01_world_sai.sql
+++ b/sql/old/3.3.5a/2012_09_02_01_world_sai.sql
diff --git a/sql/updates/world/2012_09_03_00_world_misc.sql b/sql/old/3.3.5a/2012_09_03_00_world_misc.sql
index e8910c78b40..e8910c78b40 100644
--- a/sql/updates/world/2012_09_03_00_world_misc.sql
+++ b/sql/old/3.3.5a/2012_09_03_00_world_misc.sql
diff --git a/sql/updates/world/2012_09_03_01_world_gameobject_template.sql b/sql/old/3.3.5a/2012_09_03_01_world_gameobject_template.sql
index ff0907eee6e..ff0907eee6e 100644
--- a/sql/updates/world/2012_09_03_01_world_gameobject_template.sql
+++ b/sql/old/3.3.5a/2012_09_03_01_world_gameobject_template.sql
diff --git a/sql/updates/world/2012_09_03_02_world_quest_template.sql b/sql/old/3.3.5a/2012_09_03_02_world_quest_template.sql
index 0c0a7ce4e40..0c0a7ce4e40 100644
--- a/sql/updates/world/2012_09_03_02_world_quest_template.sql
+++ b/sql/old/3.3.5a/2012_09_03_02_world_quest_template.sql
diff --git a/sql/updates/characters/2012_09_07_00_characters_characters.sql b/sql/old/3.3.5a/2012_09_07_00_characters_characters.sql
index 26ad904b4a0..26ad904b4a0 100644
--- a/sql/updates/characters/2012_09_07_00_characters_characters.sql
+++ b/sql/old/3.3.5a/2012_09_07_00_characters_characters.sql
diff --git a/sql/updates/world/2012_09_07_00_world_spell_bonus_data.sql b/sql/old/3.3.5a/2012_09_07_00_world_spell_bonus_data.sql
index 3d39c06051a..3d39c06051a 100644
--- a/sql/updates/world/2012_09_07_00_world_spell_bonus_data.sql
+++ b/sql/old/3.3.5a/2012_09_07_00_world_spell_bonus_data.sql
diff --git a/sql/updates/world/2012_09_07_01_world_creature_template.sql b/sql/old/3.3.5a/2012_09_07_01_world_creature_template.sql
index 16e4f670fd2..16e4f670fd2 100644
--- a/sql/updates/world/2012_09_07_01_world_creature_template.sql
+++ b/sql/old/3.3.5a/2012_09_07_01_world_creature_template.sql
diff --git a/sql/updates/world/2012_09_07_02_world_spell_script_names.sql b/sql/old/3.3.5a/2012_09_07_02_world_spell_script_names.sql
index 652d45543e3..652d45543e3 100644
--- a/sql/updates/world/2012_09_07_02_world_spell_script_names.sql
+++ b/sql/old/3.3.5a/2012_09_07_02_world_spell_script_names.sql
diff --git a/sql/updates/world/2012_09_08_00_world_achievement_criteria_data.sql b/sql/old/3.3.5a/2012_09_08_00_world_achievement_criteria_data.sql
index cce5745dee9..cce5745dee9 100644
--- a/sql/updates/world/2012_09_08_00_world_achievement_criteria_data.sql
+++ b/sql/old/3.3.5a/2012_09_08_00_world_achievement_criteria_data.sql
diff --git a/sql/updates/world/2012_09_08_01_world_creature_template.sql b/sql/old/3.3.5a/2012_09_08_01_world_creature_template.sql
index fb34f345f2d..fb34f345f2d 100644
--- a/sql/updates/world/2012_09_08_01_world_creature_template.sql
+++ b/sql/old/3.3.5a/2012_09_08_01_world_creature_template.sql
diff --git a/sql/updates/world/2012_09_08_02_world_achievement_criteria_data.sql b/sql/old/3.3.5a/2012_09_08_02_world_achievement_criteria_data.sql
index 2f25f6f20fa..2f25f6f20fa 100644
--- a/sql/updates/world/2012_09_08_02_world_achievement_criteria_data.sql
+++ b/sql/old/3.3.5a/2012_09_08_02_world_achievement_criteria_data.sql
diff --git a/sql/updates/world/2012_09_09_00_world_command.sql b/sql/old/3.3.5a/2012_09_09_00_world_command.sql
index 1fb3247bfbb..1fb3247bfbb 100644
--- a/sql/updates/world/2012_09_09_00_world_command.sql
+++ b/sql/old/3.3.5a/2012_09_09_00_world_command.sql
diff --git a/sql/updates/world/2012_09_09_01_world_trinity_string.sql b/sql/old/3.3.5a/2012_09_09_01_world_trinity_string.sql
index 2f3c0aa1938..2f3c0aa1938 100644
--- a/sql/updates/world/2012_09_09_01_world_trinity_string.sql
+++ b/sql/old/3.3.5a/2012_09_09_01_world_trinity_string.sql
diff --git a/sql/updates/world/2012_09_09_02_world_spell_script_names.sql b/sql/old/3.3.5a/2012_09_09_02_world_spell_script_names.sql
index a4304663d9c..a4304663d9c 100644
--- a/sql/updates/world/2012_09_09_02_world_spell_script_names.sql
+++ b/sql/old/3.3.5a/2012_09_09_02_world_spell_script_names.sql
diff --git a/sql/updates/world/2012_09_09_03_world_spell_bonus_data.sql b/sql/old/3.3.5a/2012_09_09_03_world_spell_bonus_data.sql
index a08c494da1b..a08c494da1b 100644
--- a/sql/updates/world/2012_09_09_03_world_spell_bonus_data.sql
+++ b/sql/old/3.3.5a/2012_09_09_03_world_spell_bonus_data.sql
diff --git a/sql/updates/world/2012_09_09_04_world_quest_template.sql b/sql/old/3.3.5a/2012_09_09_04_world_quest_template.sql
index 418c5badb36..418c5badb36 100644
--- a/sql/updates/world/2012_09_09_04_world_quest_template.sql
+++ b/sql/old/3.3.5a/2012_09_09_04_world_quest_template.sql
diff --git a/sql/updates/world/2012_09_10_00_world_game_event.sql b/sql/old/3.3.5a/2012_09_10_00_world_game_event.sql
index edd6413379c..edd6413379c 100644
--- a/sql/updates/world/2012_09_10_00_world_game_event.sql
+++ b/sql/old/3.3.5a/2012_09_10_00_world_game_event.sql
diff --git a/sql/updates/world/2012_09_10_01_world_quest_template.sql b/sql/old/3.3.5a/2012_09_10_01_world_quest_template.sql
index 2db8883d92c..2db8883d92c 100644
--- a/sql/updates/world/2012_09_10_01_world_quest_template.sql
+++ b/sql/old/3.3.5a/2012_09_10_01_world_quest_template.sql
diff --git a/sql/updates/world/2012_09_10_02_world_creature_text.sql b/sql/old/3.3.5a/2012_09_10_02_world_creature_text.sql
index 7a3b1a2d86f..7a3b1a2d86f 100644
--- a/sql/updates/world/2012_09_10_02_world_creature_text.sql
+++ b/sql/old/3.3.5a/2012_09_10_02_world_creature_text.sql
diff --git a/sql/updates/world/2012_09_10_03_world_quest_template.sql b/sql/old/3.3.5a/2012_09_10_03_world_quest_template.sql
index aae769ced71..aae769ced71 100644
--- a/sql/updates/world/2012_09_10_03_world_quest_template.sql
+++ b/sql/old/3.3.5a/2012_09_10_03_world_quest_template.sql
diff --git a/sql/updates/world/2012_09_10_04_world_quest_template.sql b/sql/old/3.3.5a/2012_09_10_04_world_quest_template.sql
index 5805debd094..5805debd094 100644
--- a/sql/updates/world/2012_09_10_04_world_quest_template.sql
+++ b/sql/old/3.3.5a/2012_09_10_04_world_quest_template.sql
diff --git a/sql/updates/world/2012_09_10_06_world_creature_template.sql b/sql/old/3.3.5a/2012_09_10_06_world_creature_template.sql
index 24a60b107ec..24a60b107ec 100644
--- a/sql/updates/world/2012_09_10_06_world_creature_template.sql
+++ b/sql/old/3.3.5a/2012_09_10_06_world_creature_template.sql
diff --git a/sql/updates/world/2012_09_10_07_world_go_loot_template.sql b/sql/old/3.3.5a/2012_09_10_07_world_go_loot_template.sql
index a5e30edfe2c..a5e30edfe2c 100644
--- a/sql/updates/world/2012_09_10_07_world_go_loot_template.sql
+++ b/sql/old/3.3.5a/2012_09_10_07_world_go_loot_template.sql
diff --git a/sql/updates/world/2012_09_10_08_world_spell_area.sql b/sql/old/3.3.5a/2012_09_10_08_world_spell_area.sql
index 4e4e36051c9..4e4e36051c9 100644
--- a/sql/updates/world/2012_09_10_08_world_spell_area.sql
+++ b/sql/old/3.3.5a/2012_09_10_08_world_spell_area.sql
diff --git a/sql/updates/world/2012_09_10_09_world_creature_involvedrelation.sql b/sql/old/3.3.5a/2012_09_10_09_world_creature_involvedrelation.sql
index e30e1559c54..e30e1559c54 100644
--- a/sql/updates/world/2012_09_10_09_world_creature_involvedrelation.sql
+++ b/sql/old/3.3.5a/2012_09_10_09_world_creature_involvedrelation.sql
diff --git a/sql/updates/world/2012_09_10_10_world_gossips.sql b/sql/old/3.3.5a/2012_09_10_10_world_gossips.sql
index 042b05dc83a..042b05dc83a 100644
--- a/sql/updates/world/2012_09_10_10_world_gossips.sql
+++ b/sql/old/3.3.5a/2012_09_10_10_world_gossips.sql
diff --git a/sql/updates/world/2012_09_10_11_world_event_scripts.sql b/sql/old/3.3.5a/2012_09_10_11_world_event_scripts.sql
index e0b122ede05..e0b122ede05 100644
--- a/sql/updates/world/2012_09_10_11_world_event_scripts.sql
+++ b/sql/old/3.3.5a/2012_09_10_11_world_event_scripts.sql
diff --git a/sql/updates/world/2012_09_10_12_world_sai.sql b/sql/old/3.3.5a/2012_09_10_12_world_sai.sql
index 99111fb5961..99111fb5961 100644
--- a/sql/updates/world/2012_09_10_12_world_sai.sql
+++ b/sql/old/3.3.5a/2012_09_10_12_world_sai.sql
diff --git a/sql/updates/world/2012_09_10_13_world_creature_model_info.sql b/sql/old/3.3.5a/2012_09_10_13_world_creature_model_info.sql
index 339072d0502..339072d0502 100644
--- a/sql/updates/world/2012_09_10_13_world_creature_model_info.sql
+++ b/sql/old/3.3.5a/2012_09_10_13_world_creature_model_info.sql
diff --git a/sql/updates/world/2012_09_11_00_world_misc.sql b/sql/old/3.3.5a/2012_09_11_00_world_misc.sql
index 0f47f1bf2e9..0f47f1bf2e9 100644
--- a/sql/updates/world/2012_09_11_00_world_misc.sql
+++ b/sql/old/3.3.5a/2012_09_11_00_world_misc.sql
diff --git a/sql/updates/world/2012_09_12_00_world_misc.sql b/sql/old/3.3.5a/2012_09_12_00_world_misc.sql
index 50896ce414c..50896ce414c 100644
--- a/sql/updates/world/2012_09_12_00_world_misc.sql
+++ b/sql/old/3.3.5a/2012_09_12_00_world_misc.sql
diff --git a/sql/updates/world/2012_09_12_01_world_creature.sql b/sql/old/3.3.5a/2012_09_12_01_world_creature.sql
index 1b7fa2d78ef..1b7fa2d78ef 100644
--- a/sql/updates/world/2012_09_12_01_world_creature.sql
+++ b/sql/old/3.3.5a/2012_09_12_01_world_creature.sql
diff --git a/sql/updates/world/2012_09_13_00_world_item_template.sql b/sql/old/3.3.5a/2012_09_13_00_world_item_template.sql
index 48b9d3a107f..48b9d3a107f 100644
--- a/sql/updates/world/2012_09_13_00_world_item_template.sql
+++ b/sql/old/3.3.5a/2012_09_13_00_world_item_template.sql
diff --git a/sql/updates/world/2012_09_13_01_world_fires_over_skettis.sql b/sql/old/3.3.5a/2012_09_13_01_world_fires_over_skettis.sql
index de9ba5a78fe..de9ba5a78fe 100644
--- a/sql/updates/world/2012_09_13_01_world_fires_over_skettis.sql
+++ b/sql/old/3.3.5a/2012_09_13_01_world_fires_over_skettis.sql
diff --git a/sql/updates/world/2012_09_13_01_world_ogrila.sql b/sql/old/3.3.5a/2012_09_13_01_world_ogrila.sql
index 4ccb02e02e5..4ccb02e02e5 100644
--- a/sql/updates/world/2012_09_13_01_world_ogrila.sql
+++ b/sql/old/3.3.5a/2012_09_13_01_world_ogrila.sql
diff --git a/sql/updates/world/2012_09_13_01_world_spell_script_name.sql b/sql/old/3.3.5a/2012_09_13_01_world_spell_script_name.sql
index 61e4067c544..61e4067c544 100644
--- a/sql/updates/world/2012_09_13_01_world_spell_script_name.sql
+++ b/sql/old/3.3.5a/2012_09_13_01_world_spell_script_name.sql
diff --git a/sql/updates/world/2012_09_13_01_world_spell_target_position.sql b/sql/old/3.3.5a/2012_09_13_01_world_spell_target_position.sql
index 0879dbbbda0..0879dbbbda0 100644
--- a/sql/updates/world/2012_09_13_01_world_spell_target_position.sql
+++ b/sql/old/3.3.5a/2012_09_13_01_world_spell_target_position.sql
diff --git a/sql/updates/world/2012_09_13_02_world_trinity_string.sql b/sql/old/3.3.5a/2012_09_13_02_world_trinity_string.sql
index f7214ad127b..f7214ad127b 100644
--- a/sql/updates/world/2012_09_13_02_world_trinity_string.sql
+++ b/sql/old/3.3.5a/2012_09_13_02_world_trinity_string.sql
diff --git a/sql/updates/world/2012_09_14_00_world_creature_template.sql b/sql/old/3.3.5a/2012_09_14_00_world_creature_template.sql
index 335b92e9af7..335b92e9af7 100644
--- a/sql/updates/world/2012_09_14_00_world_creature_template.sql
+++ b/sql/old/3.3.5a/2012_09_14_00_world_creature_template.sql
diff --git a/sql/updates/world/2012_09_14_00_world_sai.sql b/sql/old/3.3.5a/2012_09_14_00_world_sai.sql
index 13f11b7a795..13f11b7a795 100644
--- a/sql/updates/world/2012_09_14_00_world_sai.sql
+++ b/sql/old/3.3.5a/2012_09_14_00_world_sai.sql
diff --git a/sql/updates/world/2012_09_14_01_world_creature_loot_template.sql b/sql/old/3.3.5a/2012_09_14_01_world_creature_loot_template.sql
index 77ab9e89b04..77ab9e89b04 100644
--- a/sql/updates/world/2012_09_14_01_world_creature_loot_template.sql
+++ b/sql/old/3.3.5a/2012_09_14_01_world_creature_loot_template.sql
diff --git a/sql/updates/world/2012_09_15_00_world_achievement_criteria_data.sql b/sql/old/3.3.5a/2012_09_15_00_world_achievement_criteria_data.sql
index a30eff7024e..a30eff7024e 100644
--- a/sql/updates/world/2012_09_15_00_world_achievement_criteria_data.sql
+++ b/sql/old/3.3.5a/2012_09_15_00_world_achievement_criteria_data.sql
diff --git a/sql/updates/world/2012_09_15_00_world_creature_template.sql b/sql/old/3.3.5a/2012_09_15_00_world_creature_template.sql
index 3db5a598c1d..3db5a598c1d 100644
--- a/sql/updates/world/2012_09_15_00_world_creature_template.sql
+++ b/sql/old/3.3.5a/2012_09_15_00_world_creature_template.sql
diff --git a/sql/updates/world/2012_09_15_00_world_disables.sql b/sql/old/3.3.5a/2012_09_15_00_world_disables.sql
index 371315b5be7..371315b5be7 100644
--- a/sql/updates/world/2012_09_15_00_world_disables.sql
+++ b/sql/old/3.3.5a/2012_09_15_00_world_disables.sql
diff --git a/sql/updates/world/2012_09_15_01_world_creature_loot_template.sql b/sql/old/3.3.5a/2012_09_15_01_world_creature_loot_template.sql
index 71068d95bde..71068d95bde 100644
--- a/sql/updates/world/2012_09_15_01_world_creature_loot_template.sql
+++ b/sql/old/3.3.5a/2012_09_15_01_world_creature_loot_template.sql
diff --git a/sql/updates/world/2012_09_16_00_world_version.sql b/sql/updates/world/2012_09_16_00_world_version.sql
new file mode 100644
index 00000000000..74a1cf67499
--- /dev/null
+++ b/sql/updates/world/2012_09_16_00_world_version.sql
@@ -0,0 +1 @@
+UPDATE `version` SET `db_version`='TDB 335.49', `cache_id`=49 LIMIT 1;