diff options
| author | unknown <brian@zim.(none)> | 2006-08-10 13:44:04 -0700 |
|---|---|---|
| committer | unknown <brian@zim.(none)> | 2006-08-10 13:44:04 -0700 |
| commit | 189b8bc5313dc7cddcc225a40c1b2aacd0c2b61e (patch) | |
| tree | 7eef0e76390b5483cb9482dcfd19d0fac649d9cb /configure.in | |
| parent | 6fb4287a4e5c9c76f6dce5f2513163abf3fa1452 (diff) | |
| parent | 04d2b020a49dfc129d587380aba50e5bac6f393b (diff) | |
| download | mariadb-git-189b8bc5313dc7cddcc225a40c1b2aacd0c2b61e.tar.gz | |
Merge baker@bk-internal.mysql.com:/home/bk/mysql-5.1-new-maint
into zim.(none):/home/brian/mysql/remove-bdb-5.1
configure.in:
Auto merged
mysql-test/mysql-test-run.pl:
Auto merged
sql/Makefile.am:
Auto merged
sql/handler.cc:
Auto merged
sql/mysql_priv.h:
Auto merged
sql/mysqld.cc:
Auto merged
sql/set_var.cc:
Auto merged
Diffstat (limited to 'configure.in')
| -rw-r--r-- | configure.in | 7 |
1 files changed, 0 insertions, 7 deletions
diff --git a/configure.in b/configure.in index 26ac723c0bc..1a24e40457c 100644 --- a/configure.in +++ b/configure.in @@ -32,7 +32,6 @@ sinclude(config/ac-macros/check_cpu.m4) sinclude(config/ac-macros/character_sets.m4) sinclude(config/ac-macros/compiler_flag.m4) sinclude(config/ac-macros/plugins.m4) -sinclude(config/ac-macros/ha_berkeley.m4) sinclude(config/ac-macros/ha_ndbcluster.m4) sinclude(config/ac-macros/large_file.m4) sinclude(config/ac-macros/misc.m4) @@ -2139,12 +2138,6 @@ MYSQL_CHECK_SSL # functions tested above #-------------------------------------------------------------------- -MYSQL_STORAGE_ENGINE(berkeley, berkeley-db, [BerkeleyDB Storage Engine], - [Transactional Tables using BerkeleyDB], [max,max-no-ndb]) -MYSQL_PLUGIN_DIRECTORY(berkeley,[storage/bdb]) -MYSQL_PLUGIN_STATIC(berkeley, [[\$(bdb_libs_with_path)]]) -MYSQL_PLUGIN_ACTIONS(berkeley, [MYSQL_SETUP_BERKELEY_DB]) - MYSQL_STORAGE_ENGINE(blackhole,,[Blackhole Storage Engine], [Basic Write-only Read-never tables], [max,max-no-ndb]) MYSQL_PLUGIN_DIRECTORY(blackhole, [storage/blackhole]) |