diff options
author | unknown <monty@hundin.mysql.fi> | 2001-09-02 16:03:37 +0300 |
---|---|---|
committer | unknown <monty@hundin.mysql.fi> | 2001-09-02 16:03:37 +0300 |
commit | 992e7da03a64a12ed4bcd180dda45cb91e94a4ee (patch) | |
tree | 8e23ee5c5fb05aab08ef350c98bd7bf10f84cf47 /Build-tools | |
parent | 62c3fe9b4be15d08cd19f569eaaad495fd46a1f7 (diff) | |
download | mariadb-git-992e7da03a64a12ed4bcd180dda45cb91e94a4ee.tar.gz |
Added testing of IN(value-list)
Portability fixes
Build-tools/Do-compile:
Fix for Linux ia64
sql-bench/bench-init.pl.sh:
Added help function time_fetch_all_rows
sql-bench/test-insert.sh:
Added testing of IN(value-list)
sql/item_func.cc:
Cleanup
sql/mysqld.cc:
Portability fix
sql/stacktrace.c:
Portability fix
Diffstat (limited to 'Build-tools')
-rwxr-xr-x | Build-tools/Do-compile | 16 |
1 files changed, 11 insertions, 5 deletions
diff --git a/Build-tools/Do-compile b/Build-tools/Do-compile index 0bea693a441..4cf2477f5bd 100755 --- a/Build-tools/Do-compile +++ b/Build-tools/Do-compile @@ -4,10 +4,10 @@ use Getopt::Long; $opt_distribution=$opt_user=$opt_result=$opt_config_options=$opt_config_env=""; $opt_dbd_options=$opt_perl_options=$opt_suffix=""; $opt_tmp=$version_suffix=""; -$opt_help=$opt_Information=$opt_no_delete=$opt_debug=$opt_stage=$opt_rsh_mail=$opt_no_test=$opt_no_perl=$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_no_mysqltest=$opt_use_old_distribution=$opt_enable_shared=$opt_no_crash_me=$opt_no_strip=0; +$opt_help=$opt_Information=$opt_no_delete=$opt_delete=$opt_debug=$opt_stage=$opt_rsh_mail=$opt_no_test=$opt_no_perl=$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_no_mysqltest=$opt_use_old_distribution=$opt_enable_shared=$opt_no_crash_me=$opt_no_strip=0; $opt_innodb=$opt_bdb=0; -GetOptions("Information","help","distribution=s","user=s","result=s","no-delete","no-test","no-mysqltest","perl-files=s","debug","config-options=s","config-env=s","stage=i","rsh-mail","with-low-memory","fast-benchmark","tmp=s","static-client","static-server","static-perl","no-perl","local-perl","perl-options=s","sur","with-small-disk","dbd-options=s","tcpip","suffix=s","build-thread=i","innodb","bdb","use-old-distribution","enable-shared","no-crash-me","no-strip") || usage(); +GetOptions("Information","help","distribution=s","user=s","result=s","no-delete","delete","no-test","no-mysqltest","perl-files=s","debug","config-options=s","config-env=s","stage=i","rsh-mail","with-low-memory","fast-benchmark","tmp=s","static-client","static-server","static-perl","no-perl","local-perl","perl-options=s","sur","with-small-disk","dbd-options=s","tcpip","suffix=s","build-thread=i","innodb","bdb","use-old-distribution","enable-shared","no-crash-me","no-strip") || usage(); usage() if ($opt_help || $opt_Information); usage() if (!$opt_distribution); @@ -112,7 +112,6 @@ if ($opt_stage <= 1) { $opt_config_options.=" --with-low-memory" if ($opt_with_low_memory); # Fix files if this is in another timezone than work.mysql.com - log_system("touch *"); unlink("config.cache"); log_system("$make clean") if ($opt_use_old_distribution); if ($opt_static_server) @@ -144,7 +143,7 @@ if ($opt_stage <= 1) if ($opt_stage <= 2) { - unlink($opt_distribution) if (!$opt_no_delete && !$opt_use_old_distribution); + unlink($opt_distribution) if (!$opt_delete && !$opt_use_old_distribution); safe_system("$make"); } @@ -161,7 +160,14 @@ if ($opt_stage <= 3) $flags.="--no-strip" if ($opt_no_strip); check_system("scripts/make_binary_distribution --tmp=$opt_tmp --suffix=$opt_suffix $flags",".tar.gz created"); safe_system("mv mysql*.tar.gz $pwd/$host"); - safe_system("cp client/mysqladmin $pwd/$host/bin"); + if (-f "client/.libs/mysqladmin") + { + safe_system("cp client/.libs/mysqladmin $pwd/$host/bin"); + } + else + { + safe_system("cp client/mysqladmin $pwd/$host/bin"); + } safe_system("$make clean") if ($opt_with_small_disk); } |