diff options
| author | unknown <knielsen@knielsen-hq.org> | 2012-02-23 15:42:21 +0100 |
|---|---|---|
| committer | unknown <knielsen@knielsen-hq.org> | 2012-02-23 15:42:21 +0100 |
| commit | b8aa31c03d5f69a35109ffae11af0b43d7b9341f (patch) | |
| tree | 7108814f2f3bcc3cd3cb22528661b1b5bbc7da81 /mysys | |
| parent | 9305f2b52f8a219737653fa88ba022c901f2831b (diff) | |
| download | mariadb-git-b8aa31c03d5f69a35109ffae11af0b43d7b9341f.tar.gz | |
MWL#192 after-merge fixes.
Fix memory leak in one error case in mysqldump.
Fix that HAVE_VALGRIND_VALGRIND_H is now HAVE_VALGRIND in 5.5.
Fix that @have_ssl should not be set in embedded (introduced when
removing #undef HAVE_OPENSSL from my_global.h).
Diffstat (limited to 'mysys')
| -rw-r--r-- | mysys/my_context.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/mysys/my_context.c b/mysys/my_context.c index 0ab486605e0..d2374391a39 100644 --- a/mysys/my_context.c +++ b/mysys/my_context.c @@ -24,7 +24,7 @@ #include "m_string.h" #include "my_context.h" -#ifdef HAVE_VALGRIND_VALGRIND_H +#ifdef HAVE_VALGRIND #include <valgrind/valgrind.h> #endif @@ -134,7 +134,7 @@ my_context_init(struct my_context *c, size_t stack_size) if (!(c->stack= malloc(stack_size))) return -1; /* Out of memory */ c->stack_size= stack_size; -#ifdef HAVE_VALGRIND_VALGRIND_H +#ifdef HAVE_VALGRIND c->valgrind_stack_id= VALGRIND_STACK_REGISTER(c->stack, ((unsigned char *)(c->stack))+stack_size); #endif @@ -146,7 +146,7 @@ my_context_destroy(struct my_context *c) { if (c->stack) { -#ifdef HAVE_VALGRIND_VALGRIND_H +#ifdef HAVE_VALGRIND VALGRIND_STACK_DEREGISTER(c->valgrind_stack_id); #endif free(c->stack); @@ -384,7 +384,7 @@ my_context_init(struct my_context *c, size_t stack_size) (( ((intptr)c->stack_bot + stack_size) & ~(intptr)0xf) - 16); bzero(c->stack_top, 16); -#ifdef HAVE_VALGRIND_VALGRIND_H +#ifdef HAVE_VALGRIND c->valgrind_stack_id= VALGRIND_STACK_REGISTER(c->stack_bot, c->stack_top); #endif @@ -397,7 +397,7 @@ my_context_destroy(struct my_context *c) if (c->stack_bot) { free(c->stack_bot); -#ifdef HAVE_VALGRIND_VALGRIND_H +#ifdef HAVE_VALGRIND VALGRIND_STACK_DEREGISTER(c->valgrind_stack_id); #endif } @@ -611,7 +611,7 @@ my_context_init(struct my_context *c, size_t stack_size) (( ((intptr)c->stack_bot + stack_size) & ~(intptr)0xf) - 16); bzero(c->stack_top, 16); -#ifdef HAVE_VALGRIND_VALGRIND_H +#ifdef HAVE_VALGRIND c->valgrind_stack_id= VALGRIND_STACK_REGISTER(c->stack_bot, c->stack_top); #endif @@ -624,7 +624,7 @@ my_context_destroy(struct my_context *c) if (c->stack_bot) { free(c->stack_bot); -#ifdef HAVE_VALGRIND_VALGRIND_H +#ifdef HAVE_VALGRIND VALGRIND_STACK_DEREGISTER(c->valgrind_stack_id); #endif } |