*Merge.

--HG--
branch : trunk

sql/updates/2131_world.sql

@@ -1,4 +1,4 @@
-DELETE FROM `command` WHERE `name` IN ('server difftime', 'npc addtemp', 'gobject addtemp', '');
+DELETE FROM `command` WHERE `name` IN ('server difftime', 'npc tempadd', 'gobject tempadd', '');
 INSERT INTO `command` VALUES
 ('gobject tempadd','2','Adds a temporary gameobject that is not saved to DB.'),
 ('npc tempadd','2','Adds temporary NPC, not saved to database.');

sql/updates/2160_world.sql

@@ -1,3 +1,3 @@
-DELETE FROM command WHERE name LIKE "ahbotoption %";
+DELETE FROM `command` WHERE `name` LIKE "ahbotoption %";
-DELETE FROM command WHERE name LIKE "ahbotoptions %";
+DELETE FROM `command` WHERE `name` LIKE "ahbotoptions %";
-DELETE FROM command WHERE name IN ('gobject addtemp','npc addtemp');
+DELETE FROM `command` WHERE `name` IN ('gobject addtemp','npc addtemp');

sql/updates/2161_world.sql

@@ -1,2 +1,2 @@
-DELETE FROM command WHERE name LIKE "wp mod %";
+DELETE FROM `command` WHERE `name` LIKE "wp mod %";
-DELETE FROM command WHERE name LIKE "wp event %";
+DELETE FROM `command` WHERE `name` LIKE "wp event %";

src/trinitycore/WorldRunnable.cpp

@@ -33,7 +33,7 @@
 
 #include "Database/DatabaseEnv.h"
 
-#ifdef WIN32
+#if (defined(WIN32) || defined(SHORT_SLEEP))
 #define WORLD_SLEEP_CONST 50
 #else
 #define WORLD_SLEEP_CONST 100                               //Is this still needed?? [On linux some time ago not working 50ms]