summaryrefslogtreecommitdiff
path: root/innobase
diff options
context:
space:
mode:
authorunknown <marko@hundin.mysql.fi>2005-01-25 14:17:51 +0200
committerunknown <marko@hundin.mysql.fi>2005-01-25 14:17:51 +0200
commit891790d4c60a3232a723f87203a14974459bd24f (patch)
tree34251a06f52fb4a8fa5bcb325ac3e061c1bff17e /innobase
parentd0ad76e3538f3f789d5fc9094847e7b5f9b8d542 (diff)
parent5c3294776ced7a31056fe7e06c6c9d1934571b00 (diff)
downloadmariadb-git-891790d4c60a3232a723f87203a14974459bd24f.tar.gz
Merge hundin.mysql.fi:/home/marko/k/mysql-4.0
into hundin.mysql.fi:/home/marko/k/mysql-4.1 innobase/include/univ.i: Auto merged
Diffstat (limited to 'innobase')
-rw-r--r--innobase/include/univ.i4
1 files changed, 3 insertions, 1 deletions
diff --git a/innobase/include/univ.i b/innobase/include/univ.i
index be71d4211b3..c6ab258d3b7 100644
--- a/innobase/include/univ.i
+++ b/innobase/include/univ.i
@@ -80,8 +80,10 @@ memory is read outside the allocated blocks. */
/* Make a non-inline debug version */
+#ifdef DBUG_ON
+# define UNIV_DEBUG
+#endif /* DBUG_ON */
/*
-#define UNIV_DEBUG
#define UNIV_MEM_DEBUG
#define UNIV_IBUF_DEBUG
#define UNIV_SYNC_DEBUG