diff options
| author | unknown <serg@serg.mylan> | 2005-01-26 09:05:58 +0100 |
|---|---|---|
| committer | unknown <serg@serg.mylan> | 2005-01-26 09:05:58 +0100 |
| commit | cb271ffec80265c1960b7d909bcb004934baeb13 (patch) | |
| tree | 57f5997331e78826375c5674e185cd8831448730 /innobase/include | |
| parent | 5afe81ae610e4c4fc85f63e6c2fe5c61d81a4f7b (diff) | |
| parent | ea2795025e4172437f69e6c5819671c5b93c8aae (diff) | |
| download | mariadb-git-cb271ffec80265c1960b7d909bcb004934baeb13.tar.gz | |
Merge serg.mylan:/usr/home/serg/Abk/mysql-4.1
into serg.mylan:/usr/home/serg/Abk/mysql-5.0
innobase/include/univ.i:
Auto merged
sql/item_create.cc:
Auto merged
Diffstat (limited to 'innobase/include')
| -rw-r--r-- | innobase/include/univ.i | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/innobase/include/univ.i b/innobase/include/univ.i index c413c3bc67e..8158c198e21 100644 --- a/innobase/include/univ.i +++ b/innobase/include/univ.i @@ -80,10 +80,8 @@ 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 @@ -122,7 +120,7 @@ by one. */ /* Definition for inline version */ #ifdef __WIN__ -#define UNIV_INLINE __inline +#define UNIV_INLINE __inline #else /* config.h contains the right def for 'inline' for the current compiler */ #if (__GNUC__ == 2) |