diff options
author | unknown <monty@bitch.mysql.fi> | 2001-11-05 01:42:47 +0200 |
---|---|---|
committer | unknown <monty@bitch.mysql.fi> | 2001-11-05 01:42:47 +0200 |
commit | 906f94ba5fd7183143f9c6bd3a0aafb0fe77cc5b (patch) | |
tree | cb0287c25139e639cb25691d9c5582c0f8f2d86e /mysys/my_alloc.c | |
parent | d18a6cc33a220e056dfa1633b928ac0b1415789d (diff) | |
parent | 4703b4452b326d3b569da7fc43821edba377efc7 (diff) | |
download | mariadb-git-906f94ba5fd7183143f9c6bd3a0aafb0fe77cc5b.tar.gz |
Merge hundin:/my/mysql-4.0 into bitch.mysql.fi:/my/mysql-4.0
BitKeeper/etc/ignore:
auto-union
mysys/my_alloc.c:
Auto merged
Diffstat (limited to 'mysys/my_alloc.c')
-rw-r--r-- | mysys/my_alloc.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/mysys/my_alloc.c b/mysys/my_alloc.c index 5f3bc385c39..3b9c765a5ae 100644 --- a/mysys/my_alloc.c +++ b/mysys/my_alloc.c @@ -20,6 +20,7 @@ #include <my_global.h> #include <my_sys.h> #include <m_string.h> +#define EXTRA_DEBUG void init_alloc_root(MEM_ROOT *mem_root, uint block_size, uint pre_alloc_size) { |