23 files changed, 25 insertions, 41 deletions
diff --git a/sql/TBC-WLK converter/TBC-WLK_characters.sql b/sql/TBC-WLK converter/TBC-WLK_characters.sql
index 0d56539701f..214c19fef14 100644
--- a/sql/TBC-WLK converter/TBC-WLK_characters.sql
+++ b/sql/TBC-WLK converter/TBC-WLK_characters.sql
@@ -372,10 +372,4 @@ UPDATE item_instance SET data= CONCAT(
   SUBSTRING_INDEX(SUBSTRING_INDEX(data,' ',30),' ',-30),' 0 0 0 ',
   SUBSTRING_INDEX(SUBSTRING_INDEX(data,' ',60),' ',-60+30),' 0 ',
   SUBSTRING_INDEX(SUBSTRING_INDEX(data,' ',134),' ',-134+60))
-WHERE SUBSTRING_INDEX(data,' ',134) = data AND SUBSTRING_INDEX(data,' ',134-1) <> data;
-
-
-
-
-
-	
-\ No newline at end of file
+WHERE SUBSTRING_INDEX(data,' ',134) = data AND SUBSTRING_INDEX(data,' ',134-1) <> data;
+\ No newline at end of file
diff --git a/sql/updates/1026_(mangos_7113)_01_characters_character_achievement_progress.sql b/sql/updates/1026_mangos_7113_01_characters_character_achievement_progress.sql
index 6f125a6a2e6..6f125a6a2e6 100644
--- a/sql/updates/1026_(mangos_7113)_01_characters_character_achievement_progress.sql
+++ b/sql/updates/1026_mangos_7113_01_characters_character_achievement_progress.sql
diff --git a/sql/updates/1028_(mangos_7141)_01_world_instance_template.sql b/sql/updates/1028_mangos_7141_01_world_instance_template.sql
index f86b9517a98..f86b9517a98 100644
--- a/sql/updates/1028_(mangos_7141)_01_world_instance_template.sql
+++ b/sql/updates/1028_mangos_7141_01_world_instance_template.sql
diff --git a/sql/updates/1028_(mangos_7147)_01_world_creature_template.sql b/sql/updates/1028_mangos_7147_01_world_creature_template.sql
index 385ec769156..385ec769156 100644
--- a/sql/updates/1028_(mangos_7147)_01_world_creature_template.sql
+++ b/sql/updates/1028_mangos_7147_01_world_creature_template.sql
diff --git a/sql/updates/1028_(mangos_7150)_01_world_playercreateinfo_spell.sql b/sql/updates/1028_mangos_7150_01_world_playercreateinfo_spell.sql
index 6d4a5993e58..6d4a5993e58 100644
--- a/sql/updates/1028_(mangos_7150)_01_world_playercreateinfo_spell.sql
+++ b/sql/updates/1028_mangos_7150_01_world_playercreateinfo_spell.sql
diff --git a/sql/updates/1084_(mangos_7168)_01_world_command.sql b/sql/updates/1084_mangos_7168_01_world_command.sql
index b9df9bca12d..b9df9bca12d 100644
--- a/sql/updates/1084_(mangos_7168)_01_world_command.sql
+++ b/sql/updates/1084_mangos_7168_01_world_command.sql
diff --git a/sql/updates/1094_(mangos_7193)_01_world_trinity_string.sql b/sql/updates/1094_mangos_7193_01_world_trinity_string.sql
index 44a390d20f6..44a390d20f6 100644
--- a/sql/updates/1094_(mangos_7193)_01_world_trinity_string.sql
+++ b/sql/updates/1094_mangos_7193_01_world_trinity_string.sql
diff --git a/sql/updates/1108_(mangos_7196)_02_world_spell_bonus_data.sql b/sql/updates/1108_mangos_7196_02_world_spell_bonus_data.sql
index 8f6fdbd1463..8f6fdbd1463 100644
--- a/sql/updates/1108_(mangos_7196)_02_world_spell_bonus_data.sql
+++ b/sql/updates/1108_mangos_7196_02_world_spell_bonus_data.sql
diff --git a/sql/updates/1108_(mangos_7198)_01_characters_characters.sql b/sql/updates/1108_mangos_7198_01_characters_characters.sql
index 104a31359df..104a31359df 100644
--- a/sql/updates/1108_(mangos_7198)_01_characters_characters.sql
+++ b/sql/updates/1108_mangos_7198_01_characters_characters.sql
diff --git a/sql/updates/1108_(mangos_7199)_01_world_spell_bonus_data.sql b/sql/updates/1108_mangos_7199_01_world_spell_bonus_data.sql
index 89bad64d3e1..89bad64d3e1 100644
--- a/sql/updates/1108_(mangos_7199)_01_world_spell_bonus_data.sql
+++ b/sql/updates/1108_mangos_7199_01_world_spell_bonus_data.sql
diff --git a/sql/updates/1135_(mangos_7207)_01_world_creature.sql b/sql/updates/1135_mangos_7207_01_world_creature.sql
index 7566ba87076..7566ba87076 100644
--- a/sql/updates/1135_(mangos_7207)_01_world_creature.sql
+++ b/sql/updates/1135_mangos_7207_01_world_creature.sql
diff --git a/sql/updates/1135_(mangos_7207)_02_world_gameobject.sql b/sql/updates/1135_mangos_7207_02_world_gameobject.sql
index aef9f853f54..aef9f853f54 100644
--- a/sql/updates/1135_(mangos_7207)_02_world_gameobject.sql
+++ b/sql/updates/1135_mangos_7207_02_world_gameobject.sql
diff --git a/sql/updates/1135_(mangos_7207)_03_characters_corpse.sql b/sql/updates/1135_mangos_7207_03_characters_corpse.sql
index b1fa98e2706..b1fa98e2706 100644
--- a/sql/updates/1135_(mangos_7207)_03_characters_corpse.sql
+++ b/sql/updates/1135_mangos_7207_03_characters_corpse.sql
diff --git a/sql/updates/1140_(mangos_7209)_01_world_spell_bonus_data.sql b/sql/updates/1140_mangos_7209_01_world_spell_bonus_data.sql
index d4863c51494..d4863c51494 100644
--- a/sql/updates/1140_(mangos_7209)_01_world_spell_bonus_data.sql
+++ b/sql/updates/1140_mangos_7209_01_world_spell_bonus_data.sql
diff --git a/sql/updates/1185_(mangos_7214)_01_world_command.sql b/sql/updates/1185_mangos_7214_01_world_command.sql
index 841d538fa43..841d538fa43 100644
--- a/sql/updates/1185_(mangos_7214)_01_world_command.sql
+++ b/sql/updates/1185_mangos_7214_01_world_command.sql
diff --git a/sql/updates/1185_(mangos_7214)_02_world_trinity_string.sql b/sql/updates/1185_mangos_7214_02_world_trinity_string.sql
index 90c39d42baa..90c39d42baa 100644
--- a/sql/updates/1185_(mangos_7214)_02_world_trinity_string.sql
+++ b/sql/updates/1185_mangos_7214_02_world_trinity_string.sql
diff --git a/sql/updates/1185_(mangos_7214)_03_mangos_spell_proc_event.sql b/sql/updates/1185_mangos_7214_03_world_spell_proc_event.sql
index e93dcdc04a1..e93dcdc04a1 100644
--- a/sql/updates/1185_(mangos_7214)_03_mangos_spell_proc_event.sql
+++ b/sql/updates/1185_mangos_7214_03_world_spell_proc_event.sql
diff --git a/sql/updates/7230_02_mangos_spell_bonus_data.sql b/sql/updates/1237_mangos_7230_01_world_spell_bonus_data.sql
index 85333ee2a88..4b12bf6c546 100644
--- a/sql/updates/7230_02_mangos_spell_bonus_data.sql
+++ b/sql/updates/1237_mangos_7230_01_world_spell_bonus_data.sql
@@ -1,4 +1,4 @@
-ALTER TABLE db_version CHANGE COLUMN required_7230_01_mangos_spell_chain required_7230_02_mangos_spell_bonus_data bit;
+/*ALTER TABLE db_version CHANGE COLUMN required_7230_01_mangos_spell_chain required_7230_02_mangos_spell_bonus_data bit;*/
 
 DELETE FROM `spell_bonus_data` WHERE `entry` IN (18220,18937,18938,27265,59092);
 INSERT INTO `spell_bonus_data` VALUES
@@ -6,4 +6,4 @@ INSERT INTO `spell_bonus_data` VALUES
 ('18937', '0.96', '0', '0', 'Warlock - Dark Pact Rank 2'),
 ('18938', '0.96', '0', '0', 'Warlock - Dark Pact Rank 3'),
 ('27265', '0.96', '0', '0', 'Warlock - Dark Pact Rank 4'),
-('59092', '0.96', '0', '0', 'Warlock - Dark Pact Rank 5');
+('59092', '0.96', '0', '0', 'Warlock - Dark Pact Rank 5');
+\ No newline at end of file
diff --git a/sql/updates/7235_01_mangos_command.sql b/sql/updates/1248_mangos_7235_01_world_command.sql
index 05c24480fc7..05c24480fc7 100644
--- a/sql/updates/7235_01_mangos_command.sql
+++ b/sql/updates/1248_mangos_7235_01_world_command.sql
diff --git a/sql/updates/1018_wrold.sql b/sql/updates/2.4.3_updates/1018_wrold.sql
index ca298faa8f3..ca298faa8f3 100644
--- a/sql/updates/1018_wrold.sql
+++ b/sql/updates/2.4.3_updates/1018_wrold.sql
diff --git a/sql/updates/875_(mangos_7047)_01_characters_character_spell.sql b/sql/updates/875_mangos_7047_01_characters_character_spell.sql
index acced8e0b6e..71c7ee79e3b 100644
--- a/sql/updates/875_(mangos_7047)_01_characters_character_spell.sql
+++ b/sql/updates/875_mangos_7047_01_characters_character_spell.sql
@@ -1,6 +1,5 @@
 /*ALTER TABLE character_db_version CHANGE COLUMN required_6976_02_characters_character_db_version required_7047_01_characters_character_spell bit;*/
 
-/* ERROR 1136 (21S01) at line 4: Column count doesn't match value count at row 1 
 DELETE FROM `character_spell` WHERE `spell` IN ('28880', 59542, 59543, 59544, 59545, 59547, 59548);
 INSERT INTO character_spell SELECT characters.guid as guid, 28880, 4294967295, 1, 0  FROM `characters` WHERE characters.race=11 AND characters.class = 1;
 INSERT INTO character_spell SELECT characters.guid as guid, 59542, 4294967295, 1, 0  FROM `characters` WHERE characters.race=11 AND characters.class = 2;
@@ -8,15 +7,4 @@ INSERT INTO character_spell SELECT characters.guid as guid, 59543, 4294967295, 1
 INSERT INTO character_spell SELECT characters.guid as guid, 59544, 4294967295, 1, 0  FROM `characters` WHERE characters.race=11 AND characters.class = 5;
 INSERT INTO character_spell SELECT characters.guid as guid, 59545, 4294967295, 1, 0  FROM `characters` WHERE characters.race=11 AND characters.class = 6;
 INSERT INTO character_spell SELECT characters.guid as guid, 59547, 4294967295, 1, 0  FROM `characters` WHERE characters.race=11 AND characters.class = 7;
-INSERT INTO character_spell SELECT characters.guid as guid, 59548, 4294967295, 1, 0  FROM `characters` WHERE characters.race=11 AND characters.class = 8;
-*/
-
-/* same query , without character_spell.slot*/
-DELETE FROM `character_spell` WHERE `spell` IN ('28880', 59542, 59543, 59544, 59545, 59547, 59548);
-INSERT INTO character_spell SELECT characters.guid as guid, 28880, 1, 0  FROM `characters` WHERE characters.race=11 AND characters.class = 1;
-INSERT INTO character_spell SELECT characters.guid as guid, 59542, 1, 0  FROM `characters` WHERE characters.race=11 AND characters.class = 2;
-INSERT INTO character_spell SELECT characters.guid as guid, 59543, 1, 0  FROM `characters` WHERE characters.race=11 AND characters.class = 3;
-INSERT INTO character_spell SELECT characters.guid as guid, 59544, 1, 0  FROM `characters` WHERE characters.race=11 AND characters.class = 5;
-INSERT INTO character_spell SELECT characters.guid as guid, 59545, 1, 0  FROM `characters` WHERE characters.race=11 AND characters.class = 6;
-INSERT INTO character_spell SELECT characters.guid as guid, 59547, 1, 0  FROM `characters` WHERE characters.race=11 AND characters.class = 7;
-INSERT INTO character_spell SELECT characters.guid as guid, 59548, 1, 0  FROM `characters` WHERE characters.race=11 AND characters.class = 8;
+INSERT INTO character_spell SELECT characters.guid as guid, 59548, 4294967295, 1, 0  FROM `characters` WHERE characters.race=11 AND characters.class = 8;
+\ No newline at end of file
diff --git a/sql/updates/875_(mangos_7059)_01_characters_pet_spell.sql b/sql/updates/875_mangos_7059_01_characters_pet_spell.sql
index 11f1063ebc3..11f1063ebc3 100644
--- a/sql/updates/875_(mangos_7059)_01_characters_pet_spell.sql
+++ b/sql/updates/875_mangos_7059_01_characters_pet_spell.sql
diff --git a/sql/updates/CMakeLists.txt b/sql/updates/CMakeLists.txt
index f4962d15292..f409aaeefab 100644
--- a/sql/updates/CMakeLists.txt
+++ b/sql/updates/CMakeLists.txt
@@ -1,23 +1,25 @@
 INSTALL(FILES
 805_world_scripts
-875_(mangos_7047)_01_characters_character_spell.sql
-875_(mangos_7059)_01_characters_pet_spell.sql
-1026_(mangos_7113)_01_characters_character_achievement_progress.sql
-1028_(mangos_7141)_01_world_instance_template.sql
-1028_(mangos_7147)_01_world_creature_template.sql
-1028_(mangos_7150)_01_world_playercreateinfo_spell.sql
-1084_(mangos_7168)_01_world_command.sql
-1094_(mangos_7193)_01_world_trinity_string.sql
-1108_(mangos_7196)_02_world_spell_bonus_data.sql
-1108_(mangos_7198)_01_characters_characters.sql
-1108_(mangos_7199)_01_world_spell_bonus_data.sql
-1135_(mangos_7207)_01_world_creature.sql
-1135_(mangos_7207)_02_world_gameobject.sql
-1135_(mangos_7207)_03_characters_corpse.sql
-1140_(mangos_7209)_01_world_spell_bonus_data.sql
-1185_(mangos_7214)_01_world_command.sql
-1185_(mangos_7214)_02_world_trinity_string.sql
-1185_(mangos_7214)_03_mangos_spell_proc_event.sql
+875_mangos_7047_01_characters_character_spell.sql
+875_mangos_7059_01_characters_pet_spell.sql
+1026_mangos_7113_01_characters_character_achievement_progress.sql
+1028_mangos_7141_01_world_instance_template.sql
+1028_mangos_7147_01_world_creature_template.sql
+1028_mangos_7150_01_world_playercreateinfo_spell.sql
+1084_mangos_7168_01_world_command.sql
+1094_mangos_7193_01_world_trinity_string.sql
+1108_mangos_7196_02_world_spell_bonus_data.sql
+1108_mangos_7198_01_characters_characters.sql
+1108_mangos_7199_01_world_spell_bonus_data.sql
+1135_mangos_7207_01_world_creature.sql
+1135_mangos_7207_02_world_gameobject.sql
+1135_mangos_7207_03_characters_corpse.sql
+1140_mangos_7209_01_world_spell_bonus_data.sql
+1185_mangos_7214_01_world_command.sql
+1185_mangos_7214_02_world_trinity_string.sql
+1185_mangos_7214_03_world_spell_proc_event.sql
 1206_world_scripts.sql
 1207_world_scripts.sql
-DESTINATION share/trinity/sql/updates)
+1237_mangos_7230_01_world_spell_bonus_data
+1248_mangos_7235_01_world_command
+DESTINATION share/trinity/sql/updates)
+\ No newline at end of file