diff options
| author | unknown <serg@serg.mylan> | 2005-01-26 09:54:12 +0100 |
|---|---|---|
| committer | unknown <serg@serg.mylan> | 2005-01-26 09:54:12 +0100 |
| commit | fdae13db98f63088b90d2b6d2726a81f37560aa3 (patch) | |
| tree | ded6c587a2f9935db6accfaa14edfa14f4213e8f /innobase/include | |
| parent | 56bf2ce986d6a41e0b8359d3f60d77d949a0e597 (diff) | |
| parent | cb271ffec80265c1960b7d909bcb004934baeb13 (diff) | |
| download | mariadb-git-fdae13db98f63088b90d2b6d2726a81f37560aa3.tar.gz | |
merged
Diffstat (limited to 'innobase/include')
| -rw-r--r-- | innobase/include/eval0eval.ic | 2 | ||||
| -rw-r--r-- | innobase/include/univ.i | 6 |
2 files changed, 2 insertions, 6 deletions
diff --git a/innobase/include/eval0eval.ic b/innobase/include/eval0eval.ic index 2530c869206..069cbfe5f37 100644 --- a/innobase/include/eval0eval.ic +++ b/innobase/include/eval0eval.ic @@ -205,8 +205,6 @@ eval_node_copy_and_alloc_val( { byte* data; - ut_ad(UNIV_SQL_NULL > ULINT_MAX); - if (len == UNIV_SQL_NULL) { dfield_set_len(que_node_get_val(node), len); 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) |