summaryrefslogtreecommitdiff
path: root/dbug
diff options
context:
space:
mode:
authorkostja@bodhi.local <>2006-08-12 21:06:51 +0400
committerkostja@bodhi.local <>2006-08-12 21:06:51 +0400
commit04c97488f91c3db48be384c2ed14082dc6d6616b (patch)
treecccb1fdd583e353f4a229cbb0f9d585104db78f9 /dbug
parentb341356abdfa869c71d42709a13c2192603fab1c (diff)
parent6691c623100134d666b142f5752fcc022bdd1ac9 (diff)
downloadmariadb-git-04c97488f91c3db48be384c2ed14082dc6d6616b.tar.gz
Merge bodhi.local:/opt/local/work/tmp_merge
into bodhi.local:/opt/local/work/mysql-5.1-runtime-merge
Diffstat (limited to 'dbug')
-rw-r--r--dbug/dbug.c5
1 files changed, 4 insertions, 1 deletions
diff --git a/dbug/dbug.c b/dbug/dbug.c
index 48b2398e9c6..a543a335952 100644
--- a/dbug/dbug.c
+++ b/dbug/dbug.c
@@ -71,10 +71,13 @@
*
*/
+#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__)