*Merge.

--HG--
branch : trunk

6 files changed, 127 insertions, 11 deletions

diff --git a/sql/characters.sql b/sql/characters.sql
index 58f3007b422..c3d8cffdd26 100644
--- a/sql/characters.sql
+++ b/sql/characters.sql
@@ -715,7 +715,7 @@ LOCK TABLES `character_tutorial` WRITE;
 UNLOCK TABLES;
 
 --
-  `arena_pending_points` int (10) UNSIGNED NOT NULL default '0';,
+  `arena_pending_points` int (10) UNSIGNED NOT NULL default '0',
 -- Table structure for table `corpse`
 --
 
diff --git a/sql/updates/785_world.sql b/sql/updates/785_world.sql
index 39b85c3871a..747b179f02b 100644
--- a/sql/updates/785_world.sql
+++ b/sql/updates/785_world.sql
@@ -1,4 +1,4 @@
-delete from command where name in ('gobject tempadd', 'npc tempadd');
+delete from command where name in ('gobject addtemp', 'npc addtemp');
 insert into command (name, security, help) values
-('gobject tempadd','2','Adds a temporary gameobject that is not saved to DB.'),
-('npc tempadd','2','Adds temporary NPC, not saved to database.');
\ No newline at end of file
+('gobject addtemp','2','Adds a temporary gameobject that is not saved to DB.'),
+('npc addtemp','2','Adds temporary NPC, not saved to database.');
diff --git a/sql/updates/822_world_scripts.sql b/sql/updates/822_world_scripts.sql
index 0102336e31f..f7a7016dcf7 100644
--- a/sql/updates/822_world_scripts.sql
+++ b/sql/updates/822_world_scripts.sql
@@ -1,2 +1,3 @@
 update creature_template set scriptname='npc_kayra_longmane' where entry=17969;
-delete from creature_template_addon where entry=17969;
\ No newline at end of file
+delete from creature_template_addon where entry=17969;
+update quest_template set specialflags=2 where entry=9752;
\ No newline at end of file
diff --git a/sql/updates/884_world.sql b/sql/updates/884_world.sql
new file mode 100644
index 00000000000..fd3ead62313
--- /dev/null
+++ b/sql/updates/884_world.sql
@@ -0,0 +1,4 @@
+delete from command where name in ('gobject tempadd','npc tempadd');
+insert into command (name, security, help) values
+('gobject addtemp','2','Adds a temporary gameobject that is not saved to DB.'),
+('npc addtemp','2','Adds temporary NPC, not saved to database.');
diff --git a/sql/updates/905_world_scripts.sql b/sql/updates/905_world_scripts.sql
new file mode 100644
index 00000000000..3e59e1f0e52
--- /dev/null
+++ b/sql/updates/905_world_scripts.sql
@@ -0,0 +1,10 @@
+UPDATE `creature_template` SET `ScriptName`='npc_grimstone' WHERE `entry`=10096;
+UPDATE `creature_template` SET `ScriptName`='mob_phalanx' WHERE `entry`=9502;
+UPDATE `creature_template` SET `ScriptName`='npc_rocknot' WHERE `entry`=9503;
+ 
+DELETE FROM `areatrigger_scripts` WHERE `entry`=1526;
+INSERT INTO `areatrigger_scripts` VALUES (1526,'at_ring_of_law');
+
+DELETE FROM `script_texts` WHERE `entry`=-1230000;
+INSERT INTO `script_texts` (`entry`,`content_default`,`sound`,`type`,`language`,`comment`) VALUES
+(-1230000,'Ah, hits the spot!',0,0,0,'rocknot SAY_GOT_BEER');
\ No newline at end of file
diff --git a/sql/updates/CMakeLists.txt b/sql/updates/CMakeLists.txt
index 53490e0a15e..ef9a6927e30 100644
--- a/sql/updates/CMakeLists.txt
+++ b/sql/updates/CMakeLists.txt
@@ -1,4 +1,4 @@
-install(FILES
+INSTALL(FILES
 11_characters.sql
 45_characters.sql
 54_world.sql
@@ -33,8 +33,109 @@ install(FILES
 175_world_scripts.sql
 176_world.sql
 182_world.sql
-194_world_blacktemple.sql
-195_world_serpent_shrine.sql
-
-#Yes, i sorted them manually, so please be as kind as to add incoming .sql updates in order.
-DESTINATION share/trinity/sql/updates)
\ No newline at end of file
+212_world_scripts.sql
+220_characters.sql
+230_world_blacktemple.sql
+230_world_scripts.sql
+230_world_serpent_shrine.sql
+230_world.sql
+231_world_scripts.sql
+233_world.sql
+238_world.sql
+240_world.sql
+241_world.sql
+247_world.sql
+262_characters.sql
+262_realmd.sql
+262_world.sql
+273_world_scripts.sql
+285_world.sql
+287_world_scripts.sql
+329_world.sql
+332_world.sql
+333_world.sql
+334_world.sql
+341_world.sql
+356_world.sql
+373_world_scripts.sql
+377_world_scripts.sql
+389_world.sql
+400_world.sql
+410_characters.sql
+426_world_scripts.sql
+427_world_scripts.sql
+444_world.sql
+452_world.sql
+455_world.sql
+471_world.sql
+480_world_scripts.sql
+488_world_scripts.sql
+502_world_scripts.sql
+505_world.sql
+506_world.sql
+513_world_scripts.sql
+519_world.sql
+537_world.sql
+541_characters.sql
+541_world.sql
+542_characters.sql
+551_world.sql
+566_world.sql
+571_world.sql
+572_world.sql
+575_world_scripts.sql
+583_world_scripts.sql
+586_world_scripts.sql
+588_world.sql
+608_world.sql
+615_world.sql
+636_world_scripts.sql
+640_world.sql
+645_world_scripts.sql
+667_world_scripts.sql
+676_world.sql
+679_world_scripts.sql
+683_world_scripts.sql
+686_world_scripts.sql
+691_world_scripts.sql
+692_world.sql
+708_world_scripts.sql
+722_world_script_texts.sql
+724_world.sql
+725_characters.sql
+725_world.sql
+728_world_scripts.sql
+733_characters.sql
+739_characters.sql
+741_characters.sql
+741_world.sql
+747_world.sql
+748_world_scripts.sql
+758_world_scripts.sql
+762_world.sql
+764_world_scripts.sql
+765_world_scripts.sql
+773_world_scripts.sql
+780_characters.sql
+783_world.sql
+785_world.sql
+789_world.sql
+807_world_scripts.sql
+817_world_scripts.sql
+822_world_scripts.sql
+826_world_scripts.sql
+832_characters.sql
+833_world_scripts.sql
+834_world_scripts.sql
+837_world_scripts.sql
+838_world_scripts.sql
+839_world_scripts.sql
+840_world_scripts.sql
+841_world_scripts.sql
+842_world.sql
+850_world_scripts.sql
+852_world_scripts.sql
+857_world_scripts.sql
+863_world_scripts.sql
+871_world.sql
+DESTINATION share/trinity/sql/updates)