diff options
author | unknown <kent@mysql.com> | 2005-03-30 02:59:17 +0200 |
---|---|---|
committer | unknown <kent@mysql.com> | 2005-03-30 02:59:17 +0200 |
commit | 32ff7adeb095f4fbdfc478478e661176d1724dee (patch) | |
tree | 699b7a74c3403a61b04e901a8d5ba65df08c4c16 /Build-tools | |
parent | 69a9e2b78977d3d0da8083c2c6c800f0cd8fdc39 (diff) | |
parent | dad034597ed0dc2f34fbd41489cb23fc25ec7341 (diff) | |
download | mariadb-git-32ff7adeb095f4fbdfc478478e661176d1724dee.tar.gz |
Merge
BitKeeper/etc/logging_ok:
auto-union
Build-tools/Do-compile:
Merge from 4.0 and 4.1
Diffstat (limited to 'Build-tools')
-rwxr-xr-x | Build-tools/Do-compile | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/Build-tools/Do-compile b/Build-tools/Do-compile index 95b20c5e06b..97ca0df87c0 100755 --- a/Build-tools/Do-compile +++ b/Build-tools/Do-compile @@ -11,7 +11,7 @@ $opt_comment=$opt_distribution=$opt_user=$opt_config_env=$opt_config_extra_env=" $opt_dbd_options=$opt_perl_options=$opt_config_options=$opt_make_options=$opt_suffix=""; $opt_tmp=$opt_version_suffix=""; $opt_bundled_zlib=$opt_help=$opt_delete=$opt_debug=$opt_stage=$opt_no_test=$opt_no_perl=$opt_one_error=$opt_with_low_memory=$opt_fast_benchmark=$opt_static_client=$opt_static_server=$opt_static_perl=$opt_sur=$opt_with_small_disk=$opt_local_perl=$opt_tcpip=$opt_build_thread=$opt_use_old_distribution=$opt_enable_shared=$opt_no_crash_me=$opt_no_strip=$opt_with_archive=$opt_with_cluster=$opt_with_csv=$opt_with_example=$opt_with_debug=$opt_no_benchmark=$opt_no_mysqltest=$opt_without_embedded=$opt_readline=$opt_with_blackhole=0; -$opt_skip_embedded_test=$opt_skip_ps_test=$opt_innodb=$opt_bdb=$opt_raid=$opt_libwrap=$opt_clearlogs=$opt_with_federated=0; +$opt_skip_embedded_test=$opt_skip_ps_test=$opt_innodb=$opt_bdb=$opt_raid=$opt_libwrap=$opt_clearlogs=$opt_with_federated=$opt_with_big_tables=0; $global_step=""; GetOptions( @@ -58,12 +58,13 @@ GetOptions( "user=s", "version-suffix=s", "with-archive", + "with-big-tables", "with-blackhole", "with-cluster", "with-csv", "with-debug", "with-example", - "with-federated", + "with-federated", "with-low-memory", "with-other-libc=s", "with-small-disk", @@ -276,6 +277,7 @@ if ($opt_stage <= 1) $opt_config_options.= " --without-ndb-debug" if ($opt_with_debug && $opt_with_cluster); $opt_config_options.= " --with-libwrap" if ($opt_libwrap); $opt_config_options.= " --with-low-memory" if ($opt_with_low_memory); + $opt_config_options.= " --with-big-tables" if ($opt_with_big_tables); $opt_config_options.= " --with-mysqld-ldflags=-all-static" if ($opt_static_server); $opt_config_options.= " --with-raid" if ($opt_raid); if ($opt_readline) |