summaryrefslogtreecommitdiff
path: root/innobase/include
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
commitb9ae83d5b874dfef98984fc9dca437b657dffa41 (patch)
tree34251a06f52fb4a8fa5bcb325ac3e061c1bff17e /innobase/include
parent4992049337493c6195bb2707c22d5c5eae23beb5 (diff)
parentb7c59b9e2266f35dbaa60f8fd2ffa371bbfc46b6 (diff)
downloadmariadb-git-b9ae83d5b874dfef98984fc9dca437b657dffa41.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/include')
-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