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 /include/my_context.h | |
| 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 'include/my_context.h')
| -rw-r--r-- | include/my_context.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/include/my_context.h b/include/my_context.h index 14974412075..1e1b7e6a749 100644 --- a/include/my_context.h +++ b/include/my_context.h @@ -60,7 +60,7 @@ struct my_context { ucontext_t base_context; ucontext_t spawned_context; int active; -#ifdef HAVE_VALGRIND_VALGRIND_H +#ifdef HAVE_VALGRIND unsigned int valgrind_stack_id; #endif #ifndef DBUG_OFF @@ -77,7 +77,7 @@ struct my_context { uint64_t save[9]; void *stack_top; void *stack_bot; -#ifdef HAVE_VALGRIND_VALGRIND_H +#ifdef HAVE_VALGRIND unsigned int valgrind_stack_id; #endif #ifndef DBUG_OFF @@ -94,7 +94,7 @@ struct my_context { uint64_t save[7]; void *stack_top; void *stack_bot; -#ifdef HAVE_VALGRIND_VALGRIND_H +#ifdef HAVE_VALGRIND unsigned int valgrind_stack_id; #endif #ifndef DBUG_OFF |