1
0
mirror of https://github.com/MariaDB/server.git synced 2025-08-08 11:22:35 +03:00

make_binary_distribution.sh:

Split copy of result files to avoid shell limit.
  Added copy of mysql-test/std_data/ndb_backup5{0,1}.
configure.in:
  Look for dlopen() even if --with-mysqld-ldflags constains "-static",
  as this is not the same as the flag to "ld", it just informs
  "libtool" to link static with libraries created part of the build,
  even if there exists shared versions.
This commit is contained in:
kent@mysql.com/c-794072d5.010-2112-6f72651.cust.bredbandsbolaget.se
2006-10-16 02:07:50 +02:00
parent dcfefed95a
commit 8692bb53a3
2 changed files with 13 additions and 4 deletions

View File

@@ -1441,9 +1441,9 @@ fi
# dlopen, dlerror # dlopen, dlerror
case "$with_mysqld_ldflags " in case "$with_mysqld_ldflags " in
*"-static "*) *"-all-static "*)
# No need to check for dlopen when mysqld is linked with # No need to check for dlopen when mysqld is linked with
# -all-static or -static as it won't be able to load any functions. # -all-static as it won't be able to load any functions.
# NOTE! It would be better if it was possible to test if dlopen # NOTE! It would be better if it was possible to test if dlopen
# can be used, but a good way to test it couldn't be found # can be used, but a good way to test it couldn't be found

View File

@@ -93,6 +93,7 @@ mkdir $BASE $BASE/bin $BASE/docs \
$BASE/include $BASE/lib $BASE/support-files $BASE/share $BASE/scripts \ $BASE/include $BASE/lib $BASE/support-files $BASE/share $BASE/scripts \
$BASE/mysql-test $BASE/mysql-test/t $BASE/mysql-test/r \ $BASE/mysql-test $BASE/mysql-test/t $BASE/mysql-test/r \
$BASE/mysql-test/include $BASE/mysql-test/std_data $BASE/mysql-test/lib \ $BASE/mysql-test/include $BASE/mysql-test/std_data $BASE/mysql-test/lib \
$BASE/mysql-test/std_data/ndb_backup50 $BASE/mysql-test/std_data/ndb_backup51 \
$BASE/mysql-test/extra \ $BASE/mysql-test/extra \
$BASE/mysql-test/extra/binlog_tests $BASE/mysql-test/extra/rpl_tests $BASE/mysql-test/extra/binlog_tests $BASE/mysql-test/extra/rpl_tests
@@ -249,12 +250,20 @@ $CP mysql-test/std_data/*.dat mysql-test/std_data/*.frm \
mysql-test/std_data/des_key_file mysql-test/std_data/*.*001 \ mysql-test/std_data/des_key_file mysql-test/std_data/*.*001 \
mysql-test/std_data/*.cnf \ mysql-test/std_data/*.cnf \
$BASE/mysql-test/std_data $BASE/mysql-test/std_data
$CP mysql-test/std_data/ndb_backup50/*.Data \
mysql-test/std_data/ndb_backup50/*.ctl \
mysql-test/std_data/ndb_backup50/*.log \
$BASE/mysql-test/std_data/ndb_backup50
$CP mysql-test/std_data/ndb_backup51/*.Data \
mysql-test/std_data/ndb_backup51/*.ctl \
mysql-test/std_data/ndb_backup51/*.log \
$BASE/mysql-test/std_data/ndb_backup51
$CP mysql-test/t/*.test $BASE/mysql-test/t $CP mysql-test/t/*.test $BASE/mysql-test/t
$CP mysql-test/t/*.imtest mysql-test/t/*.disabled $BASE/mysql-test/t $CP mysql-test/t/*.imtest mysql-test/t/*.disabled $BASE/mysql-test/t
$CP mysql-test/t/*.opt mysql-test/t/*.slave-mi $BASE/mysql-test/t $CP mysql-test/t/*.opt mysql-test/t/*.slave-mi $BASE/mysql-test/t
$CP mysql-test/t/*.sh mysql-test/t/*.sql $BASE/mysql-test/t $CP mysql-test/t/*.sh mysql-test/t/*.sql $BASE/mysql-test/t
$CP mysql-test/r/*.result mysql-test/r/*.require \ $CP mysql-test/r/*.result $BASE/mysql-test/r
$BASE/mysql-test/r $CP mysql-test/r/*.require $BASE/mysql-test/r
$CP mysql-test/extra/binlog_tests/*.test $BASE/mysql-test/extra/binlog_tests $CP mysql-test/extra/binlog_tests/*.test $BASE/mysql-test/extra/binlog_tests
$CP mysql-test/extra/rpl_tests/*.test $BASE/mysql-test/extra/rpl_tests $CP mysql-test/extra/rpl_tests/*.test $BASE/mysql-test/extra/rpl_tests