aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authormegamage <none@none>2009-04-08 13:38:08 -0500
committermegamage <none@none>2009-04-08 13:38:08 -0500
commit9e1a9315be550a69e15538836a96fb986b2d78b6 (patch)
treebacdcb8bc9fa5925fbd730ae84f23c6833f4a237
parentce9211a5bc992acb0d0616066be9a1c7495889c0 (diff)
parent07f8007655825dc1b7fa23ff88663468dc90c967 (diff)
*Merge.
--HG-- branch : trunk
-rw-r--r--sql/updates/2479_world.sql2
-rw-r--r--sql/updates/2492_mangos_7622_01_world_creature_ai_scripts.sql (renamed from sql/updates/7622_01_mangos_creature_ai_scripts.sql)3
-rw-r--r--sql/updates/2492_mangos_7622_02_world_creature_ai_summons.sql (renamed from sql/updates/7622_02_mangos_creature_ai_summons.sql)3
-rw-r--r--sql/updates/2492_mangos_7622_03_world_creature_ai_texts.sql (renamed from sql/updates/7622_03_mangos_creature_ai_texts.sql)5
4 files changed, 5 insertions, 8 deletions
diff --git a/sql/updates/2479_world.sql b/sql/updates/2479_world.sql
index e5f0e2fb772..28bb545b72f 100644
--- a/sql/updates/2479_world.sql
+++ b/sql/updates/2479_world.sql
@@ -1,2 +1,2 @@
DELETE FROM `trinity_string` WHERE `entry` = 5007;
-INSERT INTO `trinity_string` (`entry`, `content_default`, `content_loc1`, `content_loc2`, `content_loc3`, `content_loc4`, `content_loc5`, `content_loc6`, `content_loc7`, `content_loc8`) VALUES (5007, 'You must be in a raid group to enter this instance.', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL);
+INSERT INTO `trinity_string` (`entry`, `content_default`, `content_loc1`, `content_loc2`, `content_loc3`, `content_loc4`, `content_loc5`, `content_loc6`, `content_loc7`, `content_loc8`) VALUES (5007, 'You must be in a raid group to enter this instance.', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL); \ No newline at end of file
diff --git a/sql/updates/7622_01_mangos_creature_ai_scripts.sql b/sql/updates/2492_mangos_7622_01_world_creature_ai_scripts.sql
index 6050a8e0232..a657e359923 100644
--- a/sql/updates/7622_01_mangos_creature_ai_scripts.sql
+++ b/sql/updates/2492_mangos_7622_01_world_creature_ai_scripts.sql
@@ -1,5 +1,4 @@
-ALTER TABLE db_version CHANGE COLUMN required_7616_02_mangos_command required_7622_01_mangos_creature_ai_scripts bit;
-
+/*ALTER TABLE db_version CHANGE COLUMN required_7616_02_mangos_command required_7622_01_mangos_creature_ai_scripts bit;*/
DROP TABLE IF EXISTS `creature_ai_scripts`;
CREATE TABLE `creature_ai_scripts` (
diff --git a/sql/updates/7622_02_mangos_creature_ai_summons.sql b/sql/updates/2492_mangos_7622_02_world_creature_ai_summons.sql
index a46d933df91..e9d6a0a48e4 100644
--- a/sql/updates/7622_02_mangos_creature_ai_summons.sql
+++ b/sql/updates/2492_mangos_7622_02_world_creature_ai_summons.sql
@@ -1,5 +1,4 @@
-ALTER TABLE db_version CHANGE COLUMN required_7622_01_mangos_creature_ai_scripts required_7622_02_mangos_creature_ai_summons bit;
-
+/*ALTER TABLE db_version CHANGE COLUMN required_7622_01_mangos_creature_ai_scripts required_7622_02_mangos_creature_ai_summons bit;*/
DROP TABLE IF EXISTS `creature_ai_summons`;
CREATE TABLE `creature_ai_summons` (
diff --git a/sql/updates/7622_03_mangos_creature_ai_texts.sql b/sql/updates/2492_mangos_7622_03_world_creature_ai_texts.sql
index d8cb6ccbeeb..cdb4995367b 100644
--- a/sql/updates/7622_03_mangos_creature_ai_texts.sql
+++ b/sql/updates/2492_mangos_7622_03_world_creature_ai_texts.sql
@@ -1,5 +1,4 @@
-ALTER TABLE db_version CHANGE COLUMN required_7622_02_mangos_creature_ai_summons required_7622_03_mangos_creature_ai_texts bit;
-
+/*ALTER TABLE db_version CHANGE COLUMN required_7622_02_mangos_creature_ai_summons required_7622_03_mangos_creature_ai_texts bit;*/
DROP TABLE IF EXISTS `creature_ai_texts`;
CREATE TABLE `creature_ai_texts` (
@@ -19,4 +18,4 @@ CREATE TABLE `creature_ai_texts` (
`emote` tinyint(3) unsigned NOT NULL DEFAULT '0',
`comment` text,
PRIMARY KEY (`entry`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 ROW_FORMAT=FIXED COMMENT='Script Texts';
+) ENGINE=MyISAM DEFAULT CHARSET=utf8 ROW_FORMAT=FIXED COMMENT='Script Texts'; \ No newline at end of file