diff options
| -rw-r--r-- | configure.in | 4 | ||||
| -rw-r--r-- | scripts/make_binary_distribution.sh | 13 |
2 files changed, 13 insertions, 4 deletions
diff --git a/configure.in b/configure.in index fbd12e2707e..78bf470f8fb 100644 --- a/configure.in +++ b/configure.in @@ -1441,9 +1441,9 @@ fi # dlopen, dlerror case "$with_mysqld_ldflags " in - *"-static "*) + *"-all-static "*) # 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 # can be used, but a good way to test it couldn't be found diff --git a/scripts/make_binary_distribution.sh b/scripts/make_binary_distribution.sh index c254a77e805..81e7f22c1b8 100644 --- a/scripts/make_binary_distribution.sh +++ b/scripts/make_binary_distribution.sh @@ -93,6 +93,7 @@ mkdir $BASE $BASE/bin $BASE/docs \ $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/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/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/*.cnf \ $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/*.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/*.sh mysql-test/t/*.sql $BASE/mysql-test/t -$CP mysql-test/r/*.result mysql-test/r/*.require \ - $BASE/mysql-test/r +$CP mysql-test/r/*.result $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/rpl_tests/*.test $BASE/mysql-test/extra/rpl_tests |