From f6b78fe39dfe6806f34371b28e7b382de578163f Mon Sep 17 00:00:00 2001
From: XTZGZoReX <none@none>
Date: Tue, 24 Mar 2009 20:58:52 +0100
Subject: [PATCH 1/2] * Re-implemented SHORT_SLEEP (-DSHORT_SLEEP=1 in Cmake).

--HG--
branch : trunk
---
 src/trinitycore/WorldRunnable.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/trinitycore/WorldRunnable.cpp b/src/trinitycore/WorldRunnable.cpp
index 607b60684a..6583fb8a1b 100644
--- a/src/trinitycore/WorldRunnable.cpp
+++ b/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]

From df82ebcbfe2e3b4e577d08404ffed8967a7a3c17 Mon Sep 17 00:00:00 2001
From: Drahy <none@none>
Date: Tue, 24 Mar 2009 22:21:16 +0100
Subject: [PATCH 2/2] * Partly revered 14f8e0828c0f 2131_world was ok and
 changes are in 2160 already * Clean up the rest of sqls

--HG--
branch : trunk
---
 sql/updates/2131_world.sql | 2 +-
 sql/updates/2160_world.sql | 6 +++---
 sql/updates/2161_world.sql | 4 ++--
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/sql/updates/2131_world.sql b/sql/updates/2131_world.sql
index db0f517e61..76fb0b69c5 100644
--- a/sql/updates/2131_world.sql
+++ b/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.');
diff --git a/sql/updates/2160_world.sql b/sql/updates/2160_world.sql
index a4b308d60c..40d2c9d1bb 100644
--- a/sql/updates/2160_world.sql
+++ b/sql/updates/2160_world.sql
@@ -1,3 +1,3 @@
-DELETE FROM command WHERE name LIKE "ahbotoption %";
-DELETE FROM command WHERE name LIKE "ahbotoptions %";
-DELETE FROM command WHERE name IN ('gobject addtemp','npc addtemp');
\ No newline at end of file
+DELETE FROM `command` WHERE `name` LIKE "ahbotoption %";
+DELETE FROM `command` WHERE `name` LIKE "ahbotoptions %";
+DELETE FROM `command` WHERE `name` IN ('gobject addtemp','npc addtemp');
\ No newline at end of file
diff --git a/sql/updates/2161_world.sql b/sql/updates/2161_world.sql
index 718130ebe3..1e45d6b33e 100644
--- a/sql/updates/2161_world.sql
+++ b/sql/updates/2161_world.sql
@@ -1,2 +1,2 @@
-DELETE FROM command WHERE name LIKE "wp mod %";
-DELETE FROM command WHERE name LIKE "wp event %";
\ No newline at end of file
+DELETE FROM `command` WHERE `name` LIKE "wp mod %";
+DELETE FROM `command` WHERE `name` LIKE "wp event %";
\ No newline at end of file