*Merge.

--HG--
branch : trunk

2 files changed, 15 insertions, 0 deletions

diff --git a/sql/updates/4495_world_script.sql b/sql/updates/4495_world_script.sql
new file mode 100644
index 00000000000..8e37e081e23
--- /dev/null
+++ b/sql/updates/4495_world_script.sql
@@ -0,0 +1 @@
+UPDATE `creature_template` SET `ScriptName`='mob_mojo' WHERE `entry`='24480';
\ No newline at end of file
diff --git a/sql/updates/4498_characters_channels.sql b/sql/updates/4498_characters_channels.sql
new file mode 100644
index 00000000000..f4e8162b4e9
--- /dev/null
+++ b/sql/updates/4498_characters_channels.sql
@@ -0,0 +1,14 @@
+-- ----------------------------
+-- Table structure for channels
+-- ----------------------------
+DROP TABLE IF EXISTS `channels`;
+CREATE TABLE `channels` (
+  `m_name` text NOT NULL,
+  `m_team` int(10) unsigned NOT NULL,
+  `m_ownerGUID` int(11) unsigned NOT NULL default '0',
+  `m_announce` tinyint(1) unsigned NOT NULL default '0',
+  `m_moderate` tinyint(1) unsigned NOT NULL default '0',
+  `m_password` text,
+  `BannedList` longtext,
+  PRIMARY KEY  (`m_name`(10),`m_team`)
+) ENGINE=MyISAM DEFAULT CHARSET=utf8 ROW_FORMAT=DYNAMIC COMMENT='Access Requirements';