diff options
author | unknown <brian@brian-akers-computer.local> | 2004-04-14 14:36:36 -0400 |
---|---|---|
committer | unknown <brian@brian-akers-computer.local> | 2004-04-14 14:36:36 -0400 |
commit | 8e96797cf7ae894cc575a255ee283c64677dfaa5 (patch) | |
tree | f2093400a62fb1870556251762c63545c99eb586 /acconfig.h | |
parent | d6fa6800f5b33bed0c1fdab43951eda5a261eaef (diff) | |
parent | a17d62a60f337f0ce3c013cea45c58fab305ac8f (diff) | |
download | mariadb-git-8e96797cf7ae894cc575a255ee283c64677dfaa5.tar.gz |
Resolved changes between example storage engine and NDB storage engine.
BitKeeper/etc/logging_ok:
auto-union
acconfig.h:
Auto merged
acinclude.m4:
Merged in example storage engine with NDB
configure.in:
Resolved conflict between NDB check with EXAMPLE DB.
Diffstat (limited to 'acconfig.h')
-rw-r--r-- | acconfig.h | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/acconfig.h b/acconfig.h index 88c9e54e713..67e9d1759c6 100644 --- a/acconfig.h +++ b/acconfig.h @@ -112,6 +112,9 @@ /* Define if we are using OSF1 DEC threads on 3.2 */ #undef HAVE_DEC_3_2_THREADS +/* Builds Example DB */ +#undef HAVE_EXAMPLE_DB + /* fp_except from ieeefp.h */ #undef HAVE_FP_EXCEPT |