diff options
| author | unknown <knielsen@knielsen-hq.org> | 2009-11-13 22:26:08 +0100 |
|---|---|---|
| committer | unknown <knielsen@knielsen-hq.org> | 2009-11-13 22:26:08 +0100 |
| commit | 898f6f48b79d1f2c334fb559225b2b0fade5ea93 (patch) | |
| tree | 84df8eecd942b650f172cbd67050ee8984c0d52b /storage/xtradb/include/ut0auxconf.h | |
| parent | 275c0a7f96502b33f763fb9388dcc1c289e4792b (diff) | |
| parent | 2bde0c5e6d31583e5197e3b513f572a693161f62 (diff) | |
| download | mariadb-git-898f6f48b79d1f2c334fb559225b2b0fade5ea93.tar.gz | |
Merge XtraDB 8 into MariaDB.
Diffstat (limited to 'storage/xtradb/include/ut0auxconf.h')
| -rw-r--r-- | storage/xtradb/include/ut0auxconf.h | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/storage/xtradb/include/ut0auxconf.h b/storage/xtradb/include/ut0auxconf.h index fb5fae9b399..88fb26f1863 100644 --- a/storage/xtradb/include/ut0auxconf.h +++ b/storage/xtradb/include/ut0auxconf.h @@ -2,7 +2,7 @@ This file is included in univ.i and will cause compilation failure if not present. A custom check has been added in the generated -storage/innobase/Makefile.in that is shipped with with the InnoDB Plugin +storage/innobase/Makefile.in that is shipped with the InnoDB Plugin source archive. This check tries to compile a test program and if successful then adds "#define HAVE_ATOMIC_PTHREAD_T" to this file. This is a hack that has been developed in order to check for pthread_t @@ -12,8 +12,3 @@ If by any chance Makefile.in and ./configure are regenerated and thus the hack from Makefile.in wiped away then the "real" check from plug.in will take over. */ -/* This is temprary fix for http://bugs.mysql.com/43740 */ -/* force to enable */ -#ifdef HAVE_GCC_ATOMIC_BUILTINS -#define HAVE_ATOMIC_PTHREAD_T -#endif |