diff options
| author | unknown <patg@krsna.patg.net> | 2005-11-21 15:31:12 -0800 |
|---|---|---|
| committer | unknown <patg@krsna.patg.net> | 2005-11-21 15:31:12 -0800 |
| commit | 36dd2cf6251de53c86da69213c72aba1db3a56fb (patch) | |
| tree | 4e8f115d38d680d35b542ca6778e98b2c1d8be32 /BUILD | |
| parent | 64a81f011f60d38febc50e8b2f72caec92e5d768 (diff) | |
| parent | 533194971ad9ccd5032c31ce4611dffe144563e4 (diff) | |
| download | mariadb-git-36dd2cf6251de53c86da69213c72aba1db3a56fb.tar.gz | |
Merge pgalbraith@bk-internal.mysql.com:/home/bk/mysql-5.1-new
into krsna.patg.net:/home/patg/mysql-build/mysql-5.1-new
sql/lock.cc:
Auto merged
Diffstat (limited to 'BUILD')
| -rwxr-xr-x | BUILD/SETUP.sh | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/BUILD/SETUP.sh b/BUILD/SETUP.sh index cd1a348dfbc..eece41d72e6 100755 --- a/BUILD/SETUP.sh +++ b/BUILD/SETUP.sh @@ -57,7 +57,7 @@ global_warnings="-Wimplicit -Wreturn-type -Wswitch -Wtrigraphs -Wcomment -W -Wch c_warnings="$global_warnings -Wunused" cxx_warnings="$global_warnings -Woverloaded-virtual -Wsign-promo -Wreorder -Wctor-dtor-privacy -Wnon-virtual-dtor" base_max_configs="--with-innodb --with-berkeley-db --with-ndbcluster --with-archive-storage-engine --with-big-tables --with-blackhole-storage-engine --with-federated-storage-engine --with-csv-storage-engine --with-partition $SSL_LIBRARY" -base_max_no_ndb_configs="--with-innodb --with-berkeley-db --without-ndbcluster --with-archive-storage-engine --with-big-tables --with-blackhole-storage-engine --with-federated-storage-engine --with-csv-storage-engine $SSL_LIBRARY" +base_max_no_ndb_configs="--with-innodb --with-berkeley-db --without-ndbcluster --with-archive-storage-engine --with-big-tables --with-blackhole-storage-engine --with-federated-storage-engine --with-csv-storage-engine --with-partition $SSL_LIBRARY" max_leave_isam_configs="--with-innodb --with-berkeley-db --with-ndbcluster --with-archive-storage-engine --with-federated-storage-engine --with-blackhole-storage-engine --with-csv-storage-engine --with-embedded-server --with-big-tables --with-partition $SSL_LIBRARY" max_configs="$base_max_configs --with-embedded-server" max_no_ndb_configs="$base_max_no_ndb_configs --with-embedded-server" |