=== modified file 'dbug/dbug.c'
--- dbug/dbug.c	2011-03-08 17:39:25 +0000
+++ dbug/dbug.c	2011-04-20 09:02:02 +0000
@@ -99,7 +99,6 @@
 #include <process.h>
 #endif
 
-#ifndef DBUG_OFF
 
 
 /*
@@ -2266,19 +2265,3 @@
   return cs->func;
 }
 
-
-#else
-
-/*
- * Dummy function, workaround for MySQL bug#14420 related
- * build failure on a platform where linking with an empty
- * archive fails.
- *
- * This block can be removed as soon as a fix for bug#14420
- * is implemented.
- */
-int i_am_a_dummy_function() {
-       return 0;
-}
-
-#endif

=== modified file 'include/my_dbug.h'
--- include/my_dbug.h	2010-12-14 10:46:00 +0000
+++ include/my_dbug.h	2011-04-20 09:00:21 +0000
@@ -29,7 +29,7 @@
 #ifdef  __cplusplus
 extern "C" {
 #endif
-#if !defined(DBUG_OFF) && !defined(_lint)
+#if defined(DBUG_ON) && !defined(_lint)
 
 struct _db_stack_frame_ {
   const char *func;      /* function name of the previous stack frame       */