Merge bk-internal.mysql.com:/home/bk/mysql-maria

into  mysql.com:/home/my/mysql-maria

dbug/tests-t.pl

@@ -5,6 +5,8 @@
 #  from the end of file to invoke tests.c, which does the real dbug work.
 #
 
+use Test::More;
+
 $exe=$0;
 
 die unless $exe =~ s/(tests)-t(\.exe)?$/$1$2 /;
@@ -21,9 +23,9 @@ while (<DATA>) {
   }
 }
 
-# require/import instead of use - we know the plan only when tests are loaded
-require Test::More;
-import Test::More tests => scalar(@tests);
+plan skip_all => "because dbug is disabled" if system $exe;
+
+plan tests => scalar(@tests);
 
 for (@tests) {
   $t=$exe . shift @$_;

dbug/tests.c

@@ -2,10 +2,6 @@
   A program to test DBUG features. Used by tests-t.pl
 */
 
-#ifdef DBUG_OFF                         /* We are testing dbug */
-#undef DBUG_OFF
-#endif
-
 char *push1=0;
 
 #include <my_global.h>  /* This includes dbug.h */
@@ -42,6 +38,12 @@ int func1()
 int main (int argc, char *argv[])
 {
   int i;
+#ifdef DBUG_OFF
+  return 1;
+#endif
+  if (argc == 1)
+    return 0;
+
 #if defined(HAVE_PTHREAD_INIT) && defined(THREAD)
   pthread_init();                       /* Must be called before DBUG_ENTER */
 #endif
@@ -75,7 +77,7 @@ int main (int argc, char *argv[])
             DBUG_EVALUATE_IF("evaluate_if", "ON", "OFF"));
     DBUG_EXECUTE_IF("pop",  DBUG_POP(); );
     {
-      char s[1000];
+      char s[1000] __attribute__((unused));
       DBUG_EXPLAIN(s, sizeof(s)-1);
       DBUG_PRINT("explain", ("dbug explained: %s", s));
     }

include/my_dbug.h

@@ -112,19 +112,19 @@ extern  void _db_flush_();
 #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_SET(a1)
-#define DBUG_SET_INITIAL(a1)
-#define DBUG_POP()
-#define DBUG_PROCESS(a1)
+#define DBUG_PUSH(a1)                   do { } while(0)
+#define DBUG_SET(a1)                    do { } while(0)
+#define DBUG_SET_INITIAL(a1)            do { } while(0)
+#define DBUG_POP()                      do { } while(0)
+#define DBUG_PROCESS(a1)                do { } while(0)
 #define DBUG_SETJMP(a1) setjmp(a1)
 #define DBUG_LONGJMP(a1) longjmp(a1)
-#define DBUG_DUMP(keyword,a1,a2)
-#define DBUG_END()
+#define DBUG_DUMP(keyword,a1,a2)        do { } while(0)
+#define DBUG_END()                      do { } while(0)
 #define DBUG_ASSERT(A)                  do { } while(0)
-#define DBUG_LOCK_FILE
+#define DBUG_LOCK_FILE                  do { } while(0)
 #define DBUG_FILE (stderr)
-#define DBUG_UNLOCK_FILE
+#define DBUG_UNLOCK_FILE                do { } while(0)
 #define DBUG_EXPLAIN(buf,len)
 #define DBUG_EXPLAIN_INITIAL(buf,len)
 #define DEBUGGER_OFF                    do { } while(0)