summaryrefslogtreecommitdiff
path: root/dbug
diff options
context:
space:
mode:
authormsvensson@neptunus.(none) <>2006-08-24 12:19:41 +0200
committermsvensson@neptunus.(none) <>2006-08-24 12:19:41 +0200
commitd58af76d680f3cb1e4a19d7046a15ecf70ad2d08 (patch)
tree5dc425f2e13ded125e04e2371d9e487ced041734 /dbug
parentf6dbea4f2f5bc8063640be8ad84fa0f477d7c900 (diff)
parentb25b49a05a5b981ee90ec827a559fc509e78e01c (diff)
downloadmariadb-git-d58af76d680f3cb1e4a19d7046a15ecf70ad2d08.tar.gz
Merge neptunus.(none):/home/msvensson/mysql/bug21749/my50-bug21749
into neptunus.(none):/home/msvensson/mysql/bug21749/my51-bug21749
Diffstat (limited to 'dbug')
-rw-r--r--dbug/dbug.c5
1 files changed, 1 insertions, 4 deletions
diff --git a/dbug/dbug.c b/dbug/dbug.c
index e377c78b3bd..831c69bcdfb 100644
--- a/dbug/dbug.c
+++ b/dbug/dbug.c
@@ -71,13 +71,10 @@
*
*/
-#include <my_global.h>
-
-/* This file won't compile unless DBUG_OFF is undefined locally */
#ifdef DBUG_OFF
#undef DBUG_OFF
#endif
-
+#include <my_global.h>
#include <m_string.h>
#include <errno.h>
#if defined(MSDOS) || defined(__WIN__)