bzr commit into mysql-5.1 branch (stewart:2958)

[Stewart Smith]

#At file:///C:/cygwin/home/stewart/mysql/win-ndbwin32/

 2958 Stewart Smith	2008-10-09
       Change DBUG macros to do {} while(0) when DBUG is disabled to squash empty conditional warning
      
      Warning seen with MSVC inside NDB with conditional DBUG_DUMP and DBUG_PUSH use.
modified:
  include/my_dbug.h

=== modified file 'include/my_dbug.h'
--- a/include/my_dbug.h	2008-03-31 07:40:39 +0000
+++ b/include/my_dbug.h	2008-10-08 13:38:11 +0000
@@ -92,14 +92,14 @@ extern FILE *_db_fp_(void);
 #define DBUG_EVALUATE(keyword,a1,a2) (a2)
 #define DBUG_EVALUATE_IF(keyword,a1,a2) (a2)
 #define DBUG_PRINT(keyword,arglist) do { } while(0)
-#define DBUG_PUSH(a1)
+#define DBUG_PUSH(a1) do { } while(0)
 #define DBUG_SET(a1)
 #define DBUG_SET_INITIAL(a1)
 #define DBUG_POP()
 #define DBUG_PROCESS(a1)
 #define DBUG_SETJMP(a1) setjmp(a1)
 #define DBUG_LONGJMP(a1) longjmp(a1)
-#define DBUG_DUMP(keyword,a1,a2)
+#define DBUG_DUMP(keyword,a1,a2) do { } while(0)
 #define DBUG_END()
 #define DBUG_ASSERT(A)              do { } while(0)
 #define DBUG_LOCK_FILE