*Merge.

--HG--
branch : trunk

4 files changed, 10 insertions, 11 deletions

diff --git a/sql/updates/7558_01_mangos_mangos_string.sql b/sql/updates/2274_mangos_7558_01_world_trinity_string.sql
index c0b856a9814..a7776d74e35 100644
--- a/sql/updates/7558_01_mangos_mangos_string.sql
+++ b/sql/updates/2274_mangos_7558_01_world_trinity_string.sql
@@ -1,9 +1,9 @@
-ALTER TABLE db_version CHANGE COLUMN required_7544_01_mangos_uptime required_7558_01_mangos_mangos_string bit;
+/*ALTER TABLE db_version CHANGE COLUMN required_7544_01_mangos_uptime required_7558_01_mangos_mangos_string bit;*/
 
-DELETE FROM mangos_string WHERE entry IN (1123,1124,1125,1126,1127);
-INSERT INTO mangos_string VALUES
+DELETE FROM `trinity_string` WHERE `entry` IN (1123,1124,1125,1126,1127);
+INSERT INTO `trinity_string` VALUES
 (1123,'Not pet found',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL),
 (1124,'Wrong pet type',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL),
 (1125,'Your pet learned all talents',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL),
 (1126,'Your pet talents have been reset.',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL),
-(1127,'Talents of %s\'s pet reset.',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL);
+(1127,'Talents of %s\'s pet reset.',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL);
\ No newline at end of file
diff --git a/sql/updates/7558_02_mangos_command.sql b/sql/updates/2274_mangos_7558_02_world_command.sql
index cd5b2ff89bf..b5e4558cada 100644
--- a/sql/updates/7558_02_mangos_command.sql
+++ b/sql/updates/2274_mangos_7558_02_world_command.sql
@@ -1,6 +1,5 @@
-ALTER TABLE db_version CHANGE COLUMN required_7558_01_mangos_mangos_string required_7558_02_mangos_command bit;
+/*ALTER TABLE db_version CHANGE COLUMN required_7558_01_mangos_mangos_string required_7558_02_mangos_command bit;*/
 
 DELETE FROM `command` WHERE `name` IN ('learn all_mypettalents');
-
 INSERT INTO `command` VALUES
-('learn all_mypettalents',3,'Syntax: .learn all_mypettalents\r\n\r\nLearn all talents for your pet available for his creature type (only for hunter pets).');
+('learn all_mypettalents',3,'Syntax: .learn all_mypettalents\r\n\r\nLearn all talents for your pet available for his creature type (only for hunter pets).');
\ No newline at end of file
diff --git a/sql/updates/2276_mangos_7560_01_world_gameobject_template.sql b/sql/updates/2276_mangos_7560_01_world_gameobject_template.sql
new file mode 100644
index 00000000000..dd99f3820e4
--- /dev/null
+++ b/sql/updates/2276_mangos_7560_01_world_gameobject_template.sql
@@ -0,0 +1,4 @@
+/*ALTER TABLE db_version CHANGE COLUMN required_7558_02_mangos_command required_7560_01_mangos_gameobject_template bit;*/
+
+ALTER TABLE gameobject_template
+  ADD COLUMN IconName varchar(100) NOT NULL default '' AFTER name;
\ No newline at end of file
diff --git a/sql/updates/7560_01_mangos_gameobject_template.sql b/sql/updates/7560_01_mangos_gameobject_template.sql
deleted file mode 100644
index f980687c777..00000000000
--- a/sql/updates/7560_01_mangos_gameobject_template.sql
+++ /dev/null
@@ -1,4 +0,0 @@
-ALTER TABLE db_version CHANGE COLUMN required_7558_02_mangos_command required_7560_01_mangos_gameobject_template bit;
-
-ALTER TABLE gameobject_template
-  ADD COLUMN IconName varchar(100) NOT NULL default '' AFTER name;