diff options
| author | Elena Stepanova <elenst@ubuntu11.home> | 2013-02-08 02:21:23 +0400 |
|---|---|---|
| committer | Elena Stepanova <elenst@ubuntu11.home> | 2013-02-08 02:21:23 +0400 |
| commit | a555ceb2fb75c9958e39c963ca2a83e615629711 (patch) | |
| tree | 8ea91889819455ccfa28dfb2f2cd350c1c463f0d | |
| parent | e648ff111a1d3fe79b6bd4ff0a25e85d1b949fb2 (diff) | |
| download | mariadb-git-a555ceb2fb75c9958e39c963ca2a83e615629711.tar.gz | |
Fix for MDEV-4149, backport from 10.0:
committer: Sergei Golubchik <sergii@pisem.net>
fix for a valgrind builds.
my_alloca() cannot have MY_THREAD_SPECIFIC, because can be used
outside of the THD context.
| -rw-r--r-- | include/my_sys.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/my_sys.h b/include/my_sys.h index 25f328b8a33..13e4d463515 100644 --- a/include/my_sys.h +++ b/include/my_sys.h @@ -199,7 +199,7 @@ extern void my_large_free(uchar *ptr); #define my_alloca(SZ) alloca((size_t) (SZ)) #define my_afree(PTR) ((void)0) #else -#define my_alloca(SZ) my_malloc(SZ,MYF(MY_FAE|MY_THREAD_SPECIFIC)) +#define my_alloca(SZ) my_malloc(SZ,MYF(MY_FAE)) #define my_afree(PTR) my_free(PTR) #endif /* HAVE_ALLOCA */ |