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

Conflicts:
	src/server/game/Entities/Unit/Unit.cpp
	src/server/game/Handlers/SkillHandler.cpp

4 files changed, 12 insertions, 0 deletions

diff --git a/sql/updates/characters/2012_09_07_00_characters_characters.sql b/sql/updates/characters/2012_09_07_00_characters_characters.sql
new file mode 100644
index 00000000000..26ad904b4a0
--- /dev/null
+++ b/sql/updates/characters/2012_09_07_00_characters_characters.sql
@@ -0,0 +1,2 @@
+ALTER TABLE `characters` MODIFY `name`
+    VARCHAR(12) CHARACTER SET utf8 COLLATE utf8_bin NOT NULL;
diff --git a/sql/updates/world/2012_09_07_01_world_creature_template.sql b/sql/updates/world/2012_09_07_01_world_creature_template.sql
new file mode 100644
index 00000000000..16e4f670fd2
--- /dev/null
+++ b/sql/updates/world/2012_09_07_01_world_creature_template.sql
@@ -0,0 +1 @@
+UPDATE `creature_template` SET `unit_flags2`=`unit_flags2`|0x800; -- UNIT_FLAG2_REGENERATE_POWER
diff --git a/sql/updates/world/2012_09_07_02_world_spell_script_names.sql b/sql/updates/world/2012_09_07_02_world_spell_script_names.sql
new file mode 100644
index 00000000000..652d45543e3
--- /dev/null
+++ b/sql/updates/world/2012_09_07_02_world_spell_script_names.sql
@@ -0,0 +1,3 @@
+DELETE FROM spell_script_names WHERE spell_id = -755;
+INSERT IGNORE INTO `spell_script_names` (`spell_id`, `ScriptName`) VALUES
+(-755, 'spell_warl_health_funnel');
diff --git a/sql/updates/world/2012_09_08_00_world_achievement_criteria_data.sql b/sql/updates/world/2012_09_08_00_world_achievement_criteria_data.sql
new file mode 100644
index 00000000000..cce5745dee9
--- /dev/null
+++ b/sql/updates/world/2012_09_08_00_world_achievement_criteria_data.sql
@@ -0,0 +1,6 @@
+DELETE FROM `achievement_criteria_data` WHERE `criteria_id` IN (10304,10313);
+INSERT INTO `achievement_criteria_data` (`criteria_id`,`type`,`value1`,`value2`,`ScriptName`) VALUES
+(10304,5,62320,0,''),
+(10304,12,0,0,''),
+(10313,5,62320,0,''),
+(10313,12,1,0,'');