diff options
| author | unknown <gkodinov/kgeorge@magare.gmz> | 2008-05-05 15:04:26 +0300 |
|---|---|---|
| committer | unknown <gkodinov/kgeorge@magare.gmz> | 2008-05-05 15:04:26 +0300 |
| commit | ac8585e88a7fc8a0c71b1a38aabf171757a8e797 (patch) | |
| tree | abf659f1b97fe897ad06ffd82541140d3bd894de /include | |
| parent | b028f1fcc7812173e9d4a1fa21ad28215df4e87a (diff) | |
| parent | 6aadc3e2b9fa0f8795772f8158efef822c0060f0 (diff) | |
| download | mariadb-git-ac8585e88a7fc8a0c71b1a38aabf171757a8e797.tar.gz | |
Merge bk-internal:/home/bk/mysql-5.0
into magare.gmz:/home/kgeorge/mysql/work/merge-5.0-bugteam
mysql-test/mysql-test-run.pl:
Auto merged
Diffstat (limited to 'include')
| -rw-r--r-- | include/my_global.h | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/include/my_global.h b/include/my_global.h index b0a26e67d9b..e474b620d27 100644 --- a/include/my_global.h +++ b/include/my_global.h @@ -533,8 +533,12 @@ C_MODE_END #undef DBUG_OFF #endif -#if defined(_lint) && !defined(DBUG_OFF) -#define DBUG_OFF +/* We might be forced to turn debug off, if not turned off already */ +#if (defined(FORCE_DBUG_OFF) || defined(_lint)) && !defined(DBUG_OFF) +# define DBUG_OFF +# ifdef DBUG_ON +# undef DBUG_ON +# endif #endif #include <my_dbug.h> |