diff options
| author | unknown <acurtis@xiphis.org> | 2006-04-24 13:36:15 -0700 |
|---|---|---|
| committer | unknown <acurtis@xiphis.org> | 2006-04-24 13:36:15 -0700 |
| commit | 1260bc887358d3fc4c060b21eb1c755c3f5dee69 (patch) | |
| tree | 8d426c8740820381d4c07c02035f4a4bf29c2fa3 /BUILD/SETUP.sh | |
| parent | 3f63edb362e89df761e575842ac39ef4c86a664c (diff) | |
| parent | 5521b1bb9e5c7fb086feb9c731873b5874ccce0a (diff) | |
| download | mariadb-git-1260bc887358d3fc4c060b21eb1c755c3f5dee69.tar.gz | |
Merge xiphis.org:/home/antony/work2/wl3201.3
into xiphis.org:/home/antony/work2/wl3201.merge
BUILD/SETUP.sh:
Auto merged
libmysqld/Makefile.am:
Auto merged
sql/ha_heap.cc:
Auto merged
sql/ha_innodb.cc:
Auto merged
sql/ha_myisammrg.cc:
Auto merged
sql/ha_ndbcluster.cc:
Auto merged
sql/ha_ndbcluster_binlog.cc:
Auto merged
sql/ha_partition.cc:
Auto merged
sql/handler.cc:
Auto merged
sql/handler.h:
Auto merged
sql/log.cc:
Auto merged
sql/mysqld.cc:
Auto merged
sql/partition_info.cc:
Auto merged
sql/sql_plugin.cc:
Auto merged
sql/sql_yacc.yy:
Auto merged
storage/archive/ha_archive.cc:
Auto merged
storage/archive/ha_archive.h:
Auto merged
storage/example/ha_example.cc:
Auto merged
Makefile.am:
Merge for WL#3201, some post-merge fixes will be required.
configure.in:
Merge for WL#3201
plugin/Makefile.am:
Merge for WL#3201
storage/innobase/Makefile.am:
Merge for WL#3201
Diffstat (limited to 'BUILD/SETUP.sh')
| -rwxr-xr-x | BUILD/SETUP.sh | 15 |
1 files changed, 3 insertions, 12 deletions
diff --git a/BUILD/SETUP.sh b/BUILD/SETUP.sh index 6c83fffa8fb..d115e3c29dc 100755 --- a/BUILD/SETUP.sh +++ b/BUILD/SETUP.sh @@ -147,18 +147,9 @@ static_link="$static_link --with-client-ldflags=-all-static" local_infile_configs="--enable-local-infile" -max_configs="--with-innodb --with-berkeley-db" -max_configs="$max_configs --with-archive-storage-engine" -max_configs="$max_configs --with-big-tables" -max_configs="$max_configs --with-blackhole-storage-engine" -max_configs="$max_configs --with-federated-storage-engine" -max_configs="$max_configs --with-csv-storage-engine" -max_configs="$max_configs --with-example-storage-engine" -max_configs="$max_configs --with-partition $SSL_LIBRARY" - -max_no_embedded_configs="$max_configs --with-ndbcluster" -max_no_ndb_configs="$max_configs --without-ndbcluster --with-embedded-server" -max_configs="$max_configs --with-ndbcluster --with-embedded-server" +max_no_embedded_configs="$SSL_LIBRARY --with-modules=max" +max_no_ndb_configs="$SSL_LIBRARY --with-modules=max-no-ndb --with-embedded-server" +max_configs="$SSL_LIBRARY --with-modules=max --with-embedded-server" # # CPU and platform specific compilation flags. |