1berry/MariaDB-server
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge bk-internal:/home/bk/mysql-5.1-new-maint

Browse Source 
into  rama.(none):/home/jimw/my/mysql-5.1-clean
This commit is contained in:
jimw@rama.(none) 2006-09-06 15:41:16 -07:00
commit 75fdb8fa6a
1 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
dbug/dbug.c
View File

@ -71,9 +71,7 @@
* *
*/ */
#ifdef DBUG_OFF
#undef DBUG_OFF
#endif
#include <my_global.h> #include <my_global.h>
#include <m_string.h> #include <m_string.h>
#include <errno.h> #include <errno.h>
@ -81,6 +79,10 @@
#include <process.h> #include <process.h>
#endif #endif
#ifndef DBUG_OFF
/* /*
* Manifest constants which may be "tuned" if desired. * Manifest constants which may be "tuned" if desired.
*/ */
@ -313,6 +315,7 @@ static unsigned long Clock(void);
#define ChangeOwner(cs,name) #define ChangeOwner(cs,name)
#endif #endif
/* /*
** Macros to allow dbugging with threads ** Macros to allow dbugging with threads
*/ */
@ -2351,3 +2354,5 @@ va_list ap;
} }
#endif /* NO_VARARGS */ #endif /* NO_VARARGS */
#endif