bk commit into 5.1 tree (kent:1.2320)

[kent]

Below is the list of changes that have just been committed into a local
5.1 repository of kent. When kent does a push these changes will
be propagated to the main repository and, within 24 hours after the
push, to the public repository.
For information on how to access the public repository
see http://dev.mysql.com/doc/mysql/en/installing-source-tree.html

ChangeSet@stripped, 2006-10-16 02:07:50+02:00, kent@stripped +2 -0
  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.

  configure.in@stripped, 2006-10-15 19:45:29+02:00, kent@stripped +2 -2
    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.

  scripts/make_binary_distribution.sh@stripped, 2006-10-16 01:58:08+02:00, kent@stripped +11
-2
    Split copy of result files to avoid shell limit.
    Added copy of mysql-test/std_data/ndb_backup5{0,1}.

# This is a BitKeeper patch.  What follows are the unified diffs for the
# set of deltas contained in the patch.  The rest of the patch, the part
# that BitKeeper cares about, is below these diffs.
# User:	kent
# Host:	c-794072d5.010-2112-6f72651.cust.bredbandsbolaget.se
# Root:	/Users/kent/mysql/bk/mysql-5.1-release

--- 1.386/configure.in	2006-10-16 02:08:40 +02:00
+++ 1.387/configure.in	2006-10-16 02:08:40 +02:00
@@ -1441,9 +1441,9 @@
 # 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
 

--- 1.128/scripts/make_binary_distribution.sh	2006-10-16 02:08:41 +02:00
+++ 1.129/scripts/make_binary_distribution.sh	2006-10-16 02:08:41 +02:00
@@ -93,6 +93,7 @@
  $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 @@
     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