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

Conflicts:
	sql/old/3.3.5a/TDB56_to_TDB57_updates/world/2014_09_21_03_world.sql
	sql/old/3.3.5a/TDB56_to_TDB57_updates/world/2014_09_21_04_world.sql
	sql/old/3.3.5a/TDB56_to_TDB57_updates/world/2014_09_21_05_world.sql
	sql/old/3.3.5a/TDB56_to_TDB57_updates/world/2014_09_21_06_world.sql
	sql/old/3.3.5a/TDB56_to_TDB57_updates/world/2014_09_21_07_world.sql
	sql/old/3.3.5a/TDB56_to_TDB57_updates/world/2014_09_22_00_world.sql
	sql/old/3.3.5a/TDB56_to_TDB57_updates/world/2014_09_23_00_world.sql
	sql/old/3.3.5a/TDB56_to_TDB57_updates/world/2014_09_23_01_world.sql
	sql/old/3.3.5a/TDB56_to_TDB57_updates/world/2014_09_23_02_world.sql
	sql/old/3.3.5a/TDB56_to_TDB57_updates/world/2014_09_23_03_world.sql
	sql/old/3.3.5a/TDB56_to_TDB57_updates/world/2014_09_23_04_world.sql
	sql/old/3.3.5a/TDB56_to_TDB57_updates/world/2014_09_24_00_world.sql
	sql/old/3.3.5a/TDB56_to_TDB57_updates/world/2014_09_24_01_world.sql
	sql/old/3.3.5a/TDB56_to_TDB57_updates/world/2014_09_25_00_world.sql
	sql/old/3.3.5a/TDB56_to_TDB57_updates/world/2014_09_25_01_world.sql
	sql/old/3.3.5a/TDB56_to_TDB57_updates/world/2014_09_25_02_world.sql
	sql/old/3.3.5a/TDB56_to_TDB57_updates/world/2014_09_26_00_world.sql
	sql/old/3.3.5a/TDB56_to_TDB57_updates/world/2014_09_26_01_world.sql
	sql/old/3.3.5a/TDB56_to_TDB57_updates/world/2014_09_26_02_world.sql
	sql/old/3.3.5a/TDB56_to_TDB57_updates/world/2014_09_26_03_world.sql
	sql/old/3.3.5a/TDB56_to_TDB57_updates/world/2014_09_27_00_world.sql
	sql/old/3.3.5a/TDB56_to_TDB57_updates/world/2014_09_27_01_world.sql
	sql/old/3.3.5a/TDB56_to_TDB57_updates/world/2014_09_27_02_world.sql
	sql/old/3.3.5a/TDB56_to_TDB57_updates/world/2014_09_27_03_world.sql
	sql/old/3.3.5a/TDB56_to_TDB57_updates/world/2014_09_28_00_world.sql
	sql/old/3.3.5a/TDB56_to_TDB57_updates/world/2014_09_28_01_world.sql
	sql/old/3.3.5a/TDB56_to_TDB57_updates/world/2014_09_29_00_world.sql
	sql/old/3.3.5a/TDB56_to_TDB57_updates/world/2014_09_29_01_world.sql
	sql/old/3.3.5a/TDB56_to_TDB57_updates/world/2014_09_29_02_world_335.sql
	sql/old/3.3.5a/TDB56_to_TDB57_updates/world/2014_09_29_03_world.sql
	sql/old/3.3.5a/TDB56_to_TDB57_updates/world/2014_09_30_00_world_335.sql
	sql/old/3.3.5a/TDB56_to_TDB57_updates/world/2014_09_30_01_world.sql
	sql/old/3.3.5a/TDB56_to_TDB57_updates/world/2014_09_30_02_world.sql
	sql/old/3.3.5a/TDB56_to_TDB57_updates/world/2014_10_01_00_world.sql
	sql/old/3.3.5a/TDB56_to_TDB57_updates/world/2014_10_01_01_world.sql
	sql/old/3.3.5a/TDB56_to_TDB57_updates/world/2014_10_02_00_world.sql
	sql/old/3.3.5a/TDB56_to_TDB57_updates/world/2014_10_04_00_world.sql
	sql/old/3.3.5a/TDB56_to_TDB57_updates/world/2014_10_04_01_world.sql
	sql/old/3.3.5a/TDB56_to_TDB57_updates/world/2014_10_05_00_world.sql
	sql/old/3.3.5a/TDB56_to_TDB57_updates/world/2014_10_05_01_world.sql
	sql/old/3.3.5a/TDB56_to_TDB57_updates/world/2014_10_05_02_world.sql
	sql/old/3.3.5a/TDB56_to_TDB57_updates/world/2014_10_05_03_world.sql
	sql/old/3.3.5a/TDB56_to_TDB57_updates/world/2014_10_05_04_world.sql
	sql/old/3.3.5a/TDB56_to_TDB57_updates/world/2014_10_05_05_world.sql
	sql/old/3.3.5a/TDB56_to_TDB57_updates/world/2014_10_05_06_world.sql
	sql/old/3.3.5a/TDB56_to_TDB57_updates/world/2014_10_05_07_world.sql
	sql/old/3.3.5a/TDB56_to_TDB57_updates/world/2014_10_06_00_world.sql
	sql/old/3.3.5a/TDB56_to_TDB57_updates/world/2014_10_06_01_world.sql
	sql/old/3.3.5a/TDB56_to_TDB57_updates/world/2014_10_06_02_world.sql
	sql/old/3.3.5a/TDB56_to_TDB57_updates/world/2014_10_06_03_world.sql
	sql/old/3.3.5a/TDB56_to_TDB57_updates/world/2014_10_06_04_world.sql
	sql/old/3.3.5a/TDB56_to_TDB57_updates/world/2014_10_06_05_world.sql
	sql/old/3.3.5a/TDB56_to_TDB57_updates/world/2014_10_06_06_world.sql
	sql/old/3.3.5a/TDB56_to_TDB57_updates/world/2014_10_07_00_world.sql
	sql/old/3.3.5a/TDB56_to_TDB57_updates/world/2014_10_07_01_world.sql
	sql/old/3.3.5a/TDB56_to_TDB57_updates/world/2014_10_08_00_world.sql
	sql/old/3.3.5a/TDB56_to_TDB57_updates/world/2014_10_08_01_world.sql
	sql/old/3.3.5a/TDB56_to_TDB57_updates/world/2014_10_08_02_world.sql
	sql/old/3.3.5a/TDB56_to_TDB57_updates/world/2014_10_09_00_world.sql
	sql/old/3.3.5a/TDB56_to_TDB57_updates/world/2014_10_09_01_world.sql
	sql/old/3.3.5a/TDB56_to_TDB57_updates/world/2014_10_09_02_world.sql
	sql/old/3.3.5a/TDB56_to_TDB57_updates/world/2014_10_10_00_world.sql
	sql/old/3.3.5a/TDB56_to_TDB57_updates/world/2014_10_10_01_world_335.sql
	sql/old/3.3.5a/TDB56_to_TDB57_updates/world/2014_10_10_02_world.sql
	sql/old/3.3.5a/TDB56_to_TDB57_updates/world/2014_10_10_03_world.sql
	sql/old/3.3.5a/TDB56_to_TDB57_updates/world/2014_10_10_04_world_335.sql
	sql/old/3.3.5a/TDB56_to_TDB57_updates/world/2014_10_10_05_world.sql
	sql/old/3.3.5a/TDB56_to_TDB57_updates/world/2014_10_10_06_world.sql
	sql/old/3.3.5a/TDB56_to_TDB57_updates/world/2014_10_11_00_world.sql
	sql/old/3.3.5a/TDB56_to_TDB57_updates/world/2014_10_11_01_world.sql
	sql/old/3.3.5a/TDB56_to_TDB57_updates/world/2014_10_11_02_world.sql
	sql/old/3.3.5a/TDB56_to_TDB57_updates/world/2014_10_11_03_world.sql
	sql/old/3.3.5a/TDB56_to_TDB57_updates/world/2014_10_11_04_world.sql
	sql/old/3.3.5a/TDB56_to_TDB57_updates/world/2014_10_11_05_world.sql
	sql/old/3.3.5a/TDB56_to_TDB57_updates/world/2014_10_11_06_world.sql
	sql/old/3.3.5a/TDB56_to_TDB57_updates/world/2014_10_11_07_world.sql
	sql/old/3.3.5a/TDB56_to_TDB57_updates/world/2014_10_12_00_world.sql
	sql/old/3.3.5a/TDB56_to_TDB57_updates/world/2014_10_12_01_world.sql
	sql/old/3.3.5a/TDB56_to_TDB57_updates/world/2014_10_12_02_world.sql
	sql/old/3.3.5a/TDB56_to_TDB57_updates/world/2014_10_12_03_world.sql
	sql/old/3.3.5a/TDB56_to_TDB57_updates/world/2014_10_12_04_world.sql
	sql/old/3.3.5a/TDB56_to_TDB57_updates/world/2014_10_12_05_world.sql
	sql/old/3.3.5a/TDB56_to_TDB57_updates/world/2014_10_12_06_world.sql
	sql/old/3.3.5a/TDB56_to_TDB57_updates/world/2014_10_12_07_world.sql
	sql/old/3.3.5a/TDB56_to_TDB57_updates/world/2014_10_13_00_world.sql
	sql/old/3.3.5a/TDB56_to_TDB57_updates/world/2014_10_13_01_world.sql
	sql/old/3.3.5a/TDB56_to_TDB57_updates/world/2014_10_15_00_world.sql
	sql/old/3.3.5a/TDB56_to_TDB57_updates/world/2014_10_16_00_world.sql
	sql/old/3.3.5a/TDB56_to_TDB57_updates/world/2014_10_17_00_world.sql
	sql/old/3.3.5a/TDB56_to_TDB57_updates/world/2014_10_18_00_world.sql
	sql/old/3.3.5a/TDB56_to_TDB57_updates/world/2014_10_18_01_world.sql
	sql/old/3.3.5a/TDB56_to_TDB57_updates/world/2014_10_18_02_world.sql
	sql/old/3.3.5a/TDB56_to_TDB57_updates/world/2014_10_18_03_world.sql
	sql/old/3.3.5a/TDB56_to_TDB57_updates/world/2014_10_18_04_world.sql
	sql/updates/world/017_2014_09_21_04_world.sql
	sql/updates/world/017_2014_09_21_05_world.sql
	sql/updates/world/017_2014_09_21_06_world.sql
	sql/updates/world/017_2014_09_21_07_world.sql
	sql/updates/world/040_2014_09_22_00_world.sql
	sql/updates/world/040_2014_09_23_00_world.sql
	sql/updates/world/040_2014_09_23_01_world.sql
	sql/updates/world/040_2014_09_23_02_world.sql
	sql/updates/world/040_2014_09_23_03_world.sql
	sql/updates/world/040_2014_09_23_04_world.sql
	sql/updates/world/040_2014_09_24_00_world.sql
	sql/updates/world/040_2014_09_24_01_world.sql
	sql/updates/world/040_2014_09_25_00_world.sql
	sql/updates/world/040_2014_09_25_01_world.sql
	sql/updates/world/040_2014_09_25_02_world.sql
	sql/updates/world/040_2014_09_26_00_world.sql
	sql/updates/world/040_2014_09_26_01_world.sql
	sql/updates/world/040_2014_09_26_02_world.sql
	sql/updates/world/040_2014_09_26_03_world.sql
	sql/updates/world/040_2014_09_27_00_world.sql
	sql/updates/world/040_2014_09_27_01_world.sql
	sql/updates/world/048_2014_09_27_02_world.sql
	sql/updates/world/048_2014_09_27_03_world.sql
	sql/updates/world/050_2014_09_28_00_world.sql
	sql/updates/world/050_2014_09_28_01_world.sql
	sql/updates/world/050_2014_09_29_00_world.sql
	sql/updates/world/050_2014_09_29_01_world.sql
	sql/updates/world/050_2014_09_29_02_world_335.sql
	sql/updates/world/050_2014_09_29_03_world.sql
	sql/updates/world/050_2014_09_30_00_world_335.sql
	sql/updates/world/051_2014_09_30_01_world.sql
	sql/updates/world/051_2014_09_30_02_world.sql
	sql/updates/world/052_2014_10_01_00_world.sql
	sql/updates/world/053_2014_10_01_01_world.sql
	sql/updates/world/054_2014_10_02_00_world.sql
	sql/updates/world/058_2014_10_04_00_world.sql
	sql/updates/world/062_2014_10_05_01_world.sql
	sql/updates/world/062_2014_10_05_02_world.sql
	sql/updates/world/062_2014_10_05_03_world.sql
	sql/updates/world/062_2014_10_05_04_world.sql
	sql/updates/world/062_2014_10_05_05_world.sql
	sql/updates/world/062_2014_10_05_06_world.sql
	sql/updates/world/062_2014_10_05_07_world.sql
	sql/updates/world/062_2014_10_06_00_world.sql
	sql/updates/world/062_2014_10_06_01_world.sql
	sql/updates/world/062_2014_10_06_02_world.sql
	sql/updates/world/062_2014_10_06_03_world.sql
	sql/updates/world/062_2014_10_06_04_world.sql
	sql/updates/world/062_2014_10_06_05_world.sql
	sql/updates/world/065_2014_10_06_06_world.sql
	sql/updates/world/065_2014_10_07_00_world.sql
	sql/updates/world/065_2014_10_07_01_world.sql
	sql/updates/world/065_2014_10_08_00_world.sql
	sql/updates/world/065_2014_10_08_01_world.sql
	sql/updates/world/065_2014_10_08_02_world.sql
	sql/updates/world/065_2014_10_09_00_world.sql
	sql/updates/world/065_2014_10_09_01_world.sql
	sql/updates/world/065_2014_10_09_02_world.sql
	sql/updates/world/071_2014_10_10_00_world.sql
	sql/updates/world/071_2014_10_10_01_world_335.sql
	sql/updates/world/071_2014_10_10_03_world.sql
	sql/updates/world/071_2014_10_10_04_world_335.sql
	sql/updates/world/071_2014_10_10_05_world.sql
	sql/updates/world/072_2014_10_04_01_world.sql
	sql/updates/world/072_2014_10_05_00_world.sql
	sql/updates/world/074_2014_10_10_06_world.sql
	sql/updates/world/074_2014_10_11_00_world.sql
	sql/updates/world/075_2014_10_11_01_world.sql
	sql/updates/world/075_2014_10_11_02_world.sql
	sql/updates/world/075_2014_10_11_03_world.sql
	sql/updates/world/075_2014_10_11_04_world.sql
	sql/updates/world/075_2014_10_11_05_world.sql
	sql/updates/world/075_2014_10_11_06_world.sql
	sql/updates/world/075_2014_10_11_07_world.sql
	sql/updates/world/075_2014_10_12_00_world.sql
	sql/updates/world/075_2014_10_12_01_world.sql
	sql/updates/world/075_2014_10_12_04_world.sql
	sql/updates/world/075_2014_10_12_06_world.sql
	sql/updates/world/075_2014_10_12_07_world.sql
	sql/updates/world/077_2014_10_13_00_world.sql
	sql/updates/world/077_2014_10_13_01_world.sql
	sql/updates/world/077_2014_10_15_00_world.sql
	sql/updates/world/077_2014_10_16_00_world.sql
	sql/updates/world/077_2014_10_17_00_world.sql
	sql/updates/world/077_2014_10_18_00_world.sql
	sql/updates/world/077_2014_10_18_01_world.sql
	sql/updates/world/077_2014_10_18_02_world.sql
	sql/updates/world/077_2014_10_18_03_world.sql
	sql/updates/world/077_2014_10_18_04_world.sql
	sql/updates/world/2014_09_21_04_world.sql
	sql/updates/world/2014_09_21_05_world.sql
	sql/updates/world/2014_09_21_06_world.sql
	sql/updates/world/2014_09_21_07_world.sql
	sql/updates/world/2014_09_22_00_world.sql
	sql/updates/world/2014_09_23_00_world.sql
	sql/updates/world/2014_09_23_01_world.sql
	sql/updates/world/2014_09_23_02_world.sql
	sql/updates/world/2014_09_23_03_world.sql
	sql/updates/world/2014_09_23_04_world.sql
	sql/updates/world/2014_09_24_00_world.sql
	sql/updates/world/2014_09_24_01_world.sql
	sql/updates/world/2014_09_25_00_world.sql
	sql/updates/world/2014_09_25_01_world.sql
	sql/updates/world/2014_09_25_02_world.sql
	sql/updates/world/2014_09_26_00_world.sql
	sql/updates/world/2014_09_26_01_world.sql
	sql/updates/world/2014_09_26_02_world.sql
	sql/updates/world/2014_09_26_03_world.sql
	sql/updates/world/2014_09_27_00_world.sql
	sql/updates/world/2014_09_27_01_world.sql
	sql/updates/world/2014_09_27_02_world.sql
	sql/updates/world/2014_09_27_03_world.sql
	sql/updates/world/2014_09_28_00_world.sql
	sql/updates/world/2014_09_28_01_world.sql
	sql/updates/world/2014_09_29_00_world.sql
	sql/updates/world/2014_09_29_01_world.sql
	sql/updates/world/2014_09_29_02_world_335.sql
	sql/updates/world/2014_09_29_03_world.sql
	sql/updates/world/2014_09_30_00_world_335.sql
	sql/updates/world/2014_09_30_01_world.sql
	sql/updates/world/2014_09_30_02_world.sql
	sql/updates/world/2014_10_01_00_world.sql
	sql/updates/world/2014_10_01_01_world.sql
	sql/updates/world/2014_10_02_00_world.sql
	sql/updates/world/2014_10_04_00_world.sql
	sql/updates/world/2014_10_04_01_world.sql
	sql/updates/world/2014_10_05_00_world.sql
	sql/updates/world/2014_10_05_01_world.sql
	sql/updates/world/2014_10_05_02_world.sql
	sql/updates/world/2014_10_05_03_world.sql
	sql/updates/world/2014_10_05_04_world.sql
	sql/updates/world/2014_10_05_05_world.sql
	sql/updates/world/2014_10_05_06_world.sql
	sql/updates/world/2014_10_05_07_world.sql
	sql/updates/world/2014_10_06_00_world.sql
	sql/updates/world/2014_10_06_01_world.sql
	sql/updates/world/2014_10_06_02_world.sql
	sql/updates/world/2014_10_06_03_world.sql
	sql/updates/world/2014_10_06_04_world.sql
	sql/updates/world/2014_10_06_05_world.sql
	sql/updates/world/2014_10_06_06_world.sql
	sql/updates/world/2014_10_07_00_world.sql
	sql/updates/world/2014_10_07_01_world.sql
	sql/updates/world/2014_10_08_00_world.sql
	sql/updates/world/2014_10_08_01_world.sql
	sql/updates/world/2014_10_08_02_world.sql
	sql/updates/world/2014_10_09_00_world.sql
	sql/updates/world/2014_10_09_01_world.sql
	sql/updates/world/2014_10_09_02_world.sql
	sql/updates/world/2014_10_10_00_world.sql
	sql/updates/world/2014_10_10_01_world_335.sql
	sql/updates/world/2014_10_10_03_world.sql
	sql/updates/world/2014_10_10_04_world_335.sql
	sql/updates/world/2014_10_10_05_world.sql
	sql/updates/world/2014_10_10_06_world.sql
	sql/updates/world/2014_10_11_00_world.sql
	sql/updates/world/2014_10_11_01_world.sql
	sql/updates/world/2014_10_11_02_world.sql
	sql/updates/world/2014_10_11_03_world.sql
	sql/updates/world/2014_10_11_04_world.sql
	sql/updates/world/2014_10_11_05_world.sql
	sql/updates/world/2014_10_11_06_world.sql
	sql/updates/world/2014_10_11_07_world.sql
	sql/updates/world/2014_10_12_00_world.sql
	sql/updates/world/2014_10_12_01_world.sql
	sql/updates/world/2014_10_12_04_world.sql
	sql/updates/world/2014_10_12_06_world.sql
	sql/updates/world/2014_10_12_07_world.sql
	sql/updates/world/2014_10_13_00_world.sql
	sql/updates/world/2014_10_13_01_world.sql
	sql/updates/world/2014_10_15_00_world.sql
	sql/updates/world/2014_10_16_00_world.sql
	sql/updates/world/2014_10_17_00_world.sql
	sql/updates/world/2014_10_18_00_world.sql
	sql/updates/world/2014_10_18_01_world.sql
	sql/updates/world/2014_10_18_02_world.sql
	sql/updates/world/2014_10_18_03_world.sql
	sql/updates/world/2014_10_18_04_world.sql

3 files changed, 44 insertions, 0 deletions

diff --git a/sql/old/3.3.5a/TDB56_to_TDB57_updates/auth/2014_10_18_00_auth.sql b/sql/old/3.3.5a/TDB56_to_TDB57_updates/auth/2014_10_18_00_auth.sql
new file mode 100644
index 00000000000..fbae94a4195
--- /dev/null
+++ b/sql/old/3.3.5a/TDB56_to_TDB57_updates/auth/2014_10_18_00_auth.sql
@@ -0,0 +1,9 @@
+DELETE FROM `rbac_permissions` WHERE `id` IN (795, 796);
+INSERT INTO `rbac_permissions` (`id`, `name`) VALUES
+(795, 'Command: .instance setbossstate'),
+(796, 'Command: .instance getbossstate');
+
+DELETE FROM `rbac_linked_permissions` WHERE `linkedId` IN (795, 796);
+INSERT INTO `rbac_linked_permissions` (`id`, `linkedId`) VALUES
+(192, 795),
+(192, 796);
diff --git a/sql/old/3.3.5a/TDB56_to_TDB57_updates/auth/2014_10_18_01_auth.sql b/sql/old/3.3.5a/TDB56_to_TDB57_updates/auth/2014_10_18_01_auth.sql
new file mode 100644
index 00000000000..60808b8a9c9
--- /dev/null
+++ b/sql/old/3.3.5a/TDB56_to_TDB57_updates/auth/2014_10_18_01_auth.sql
@@ -0,0 +1,23 @@
+/* drop then create account_muted table */
+DROP TABLE IF EXISTS `account_muted`;
+
+CREATE TABLE `account_muted` (
+	`guid` INT(10) UNSIGNED NOT NULL DEFAULT '0' COMMENT 'Global Unique Identifier',
+	`mutedate` INT(10) UNSIGNED NOT NULL DEFAULT '0',
+	`mutetime` INT(10) UNSIGNED NOT NULL DEFAULT '0',
+	`mutedby` VARCHAR(50) NOT NULL,
+	`mutereason` VARCHAR(255) NOT NULL,
+	PRIMARY KEY (`guid`, `mutedate`)
+)
+COMMENT='mute List' ENGINE=InnoDB;
+
+/* add rbac permissions to new commands */
+DELETE FROM `rbac_permissions` WHERE `id`=632;
+INSERT INTO `rbac_permissions` (`id`,`name`) VALUES
+(632, 'Command: .mutehistory');
+ 
+/* adds qc to players */
+DELETE FROM `rbac_linked_permissions` WHERE `id`=632;
+INSERT INTO `rbac_linked_permissions` (`id`,`linkedId`) VALUES
+/* add mutehistory to gms */
+(194, 632);
diff --git a/sql/old/3.3.5a/TDB56_to_TDB57_updates/characters/2014_10_18_00_characters.sql b/sql/old/3.3.5a/TDB56_to_TDB57_updates/characters/2014_10_18_00_characters.sql
new file mode 100644
index 00000000000..36b2d042374
--- /dev/null
+++ b/sql/old/3.3.5a/TDB56_to_TDB57_updates/characters/2014_10_18_00_characters.sql
@@ -0,0 +1,12 @@
+DROP TABLE IF EXISTS `quest_tracker`;
+CREATE TABLE `quest_tracker` (
+    `id` MEDIUMINT(8) UNSIGNED NOT NULL DEFAULT '0',
+    `character_guid` INT(10) UNSIGNED NOT NULL DEFAULT '0',
+    `quest_accept_time` DATETIME NOT NULL,
+    `quest_complete_time` DATETIME DEFAULT NULL,
+    `quest_abandon_time` DATETIME DEFAULT NULL,
+    `completed_by_gm` BOOL NOT NULL DEFAULT '0',
+    `core_hash` VARCHAR(120) NOT NULL DEFAULT '0',
+    `core_revision` VARCHAR(120) NOT NULL DEFAULT '0'
+)
+ENGINE=InnoDB;