diff options
| author | Alexander Nozdrin <alik@sun.com> | 2010-07-29 16:32:11 +0400 |
|---|---|---|
| committer | Alexander Nozdrin <alik@sun.com> | 2010-07-29 16:32:11 +0400 |
| commit | 45fae12401eefcf4d9ff70b75c30697a42aa4b66 (patch) | |
| tree | 16a66be92ba2603896b1b010600df021911be256 /include/mysql/service_thd_alloc.h | |
| parent | 5a3f430f099f9f130d81d37875293264c6cdf6fb (diff) | |
| parent | ed4911794249952684db633f092617acfe5ca421 (diff) | |
| download | mariadb-git-45fae12401eefcf4d9ff70b75c30697a42aa4b66.tar.gz | |
Auto-merge from mysql-trunk-merge.
Diffstat (limited to 'include/mysql/service_thd_alloc.h')
| -rw-r--r-- | include/mysql/service_thd_alloc.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/include/mysql/service_thd_alloc.h b/include/mysql/service_thd_alloc.h index 86158ba1359..7061c2bd4d5 100644 --- a/include/mysql/service_thd_alloc.h +++ b/include/mysql/service_thd_alloc.h @@ -27,7 +27,9 @@ allocations - they are better served with my_malloc. */ +#ifndef MYSQL_ABI_CHECK #include <stdlib.h> +#endif #ifdef __cplusplus extern "C" { |