Commit b9ae83d5 authored by unknown's avatar unknown
Browse files

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
parents 49920493 b7c59b9e
Loading
Loading
Loading
Loading
+3 −1
Original line number Diff line number Diff line
@@ -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_MEM_DEBUG
#define UNIV_IBUF_DEBUG
#define UNIV_SYNC_DEBUG