Merge mysql.com:/Users/kent/mysql/bk/mysql-5.1-release.old03

into mysql.com:/Users/kent/mysql/bk/mysql-5.1-release


libmysqld/Makefile.am:
  Auto merged
mysql-test/mysql-test-run.pl:
  Auto merged
scripts/make_binary_distribution.sh:
  Auto merged

libmysqld/Makefile.am

@@ -137,7 +137,7 @@ else
 		  $(libmysqld_a_AR) libmysqld.a libmysqld_int.a $(INC_LIB) ; \
 		else \
 		  (for arc in ./libmysqld_int.a $(INC_LIB); do \
-		    arpath=`echo $$arc|sed 's|[^/]*$$||'`; \
+		    arpath=`echo $$arc|sed 's|[^/]*$$||'|sed 's|\.libs/$$||'`; \
 		    $(AR) t $$arc|xargs -n 1 find $$arpath -name; \
 		    $(AR) t $$arc|xargs -n 1 find `dirname $$arpath` -path \*/`basename $$arpath`/\* -name; \
 		  done; echo $(libmysqld_a_DEPENDENCIES) ) | sort -u | xargs $(AR) cq libmysqld.a ; \

mysql-test/mysql-test-run.pl

@@ -144,7 +144,6 @@ our $glob_use_running_server=     0;
 our $glob_use_running_ndbcluster= 0;
 our $glob_use_running_ndbcluster_slave= 0;
 our $glob_use_embedded_server=    0;
-our $glob_mysqld_restart=         0;
 our @glob_test_mode;
 
 our $using_ndbcluster_master= 0;

scripts/make_binary_distribution.sh

@@ -241,9 +241,10 @@ $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/t/*.test mysql-test/t/*.imtest \
-    mysql-test/t/*.disabled mysql-test/t/*.opt \
-    mysql-test/t/*.slave-mi mysql-test/t/*.sh mysql-test/t/*.sql $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/*.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/extra/binlog_tests/*.test $BASE/mysql-test/extra/binlog_tests

storage/archive/archive_test.c

+#include "azlib.h"
 #include <stdio.h>
-#include <azlib.h>
 
 #define TEST_STRING "This is a test"
 #define BUFFER_LEN 1024

storage/archive/azio.c

@@ -11,11 +11,11 @@
 
 /* @(#) $Id$ */
 
+#include "azlib.h"
+
 #include <stdio.h>
 #include <string.h>
 
-#include "azlib.h"
-
 static int const gz_magic[2] = {0x1f, 0x8b}; /* gzip magic header */
 
 /* gzip flag byte */