Merge

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;
@@ -609,7 +608,7 @@ sub command_line_setup () {
              # Specify ports
              'master_port=i'            => \$opt_master_myport,
              'slave_port=i'             => \$opt_slave_myport,
-             'ndbcluster-port=i'        => \$opt_ndbcluster_port,
+             'ndbcluster-port|ndbcluster_port=i' => \$opt_ndbcluster_port,
              'ndbcluster-port-slave=i'  => \$opt_ndbcluster_port_slave,
              'manager-port=i'           => \$opt_manager_port, # Currently not used
              'im-port=i'                => \$im_port, # Instance Manager port.

mysql-test/t/disabled.def

@@ -14,7 +14,9 @@ events_stress            : BUG#17619 2006-02-21 andrey  Test case unstable
 events                   : BUG#17619 2006-02-21 andrey  Test case unstable
 ndb_autodiscover         : BUG#18952 2006-02-16 jmiller Needs to be fixed w.r.t binlog
 ndb_autodiscover2        : BUG#18952 2006-02-16 jmiller Needs to be fixed w.r.t binlog
+ndb_binlog_ddl_multi     : BUG#18976 2006-04-10 kent    Test fails randomly
 ndb_cache2               : BUG#18597 2006-03-28 brian
+ndb_cache_multi2         : BUG#18974 2006-04-10 kent    Test fails randomly
 ndb_gis                  : BUG#18600 2006-03-28 brian
 ndb_load                 : BUG#17233 2006-02-16 jmiller
 partition_03ndb          : BUG#16385 2006-03-24 mikael
@@ -34,7 +36,9 @@ rpl_ndb_myisam2ndb       : BUG#18261 2006-03-16 mats    Cluster Replication: tes
 rpl_ndb_multi_update3    : BUG#18627 2006-03-29 monty   Cluster Replication: rpl_ndb_multi_update3 fails on Intel 64 bit
 rpl_ndb_log              : BUG#18947 2006-03-21 tomas   Result not deterministic, TBD if should remove
 rpl_ndb_relay_space      : BUG#16993 2006-02-16 jmiller
+rpl_ndb_trig004          : BUG#18977 2006-04-10 kent    Test fails randomly
 rpl_switch_stm_row_mixed : BUG#18590 2006-03-28 brian
+rpl_row_blob_innodb      : BUG#18980 2006-04-10 kent    Test fails randomly
 rpl_row_inexist_tbl      : BUG#18948 2006-03-09 mats    Disabled since patch makes this test wait forever
 rpl_sp                   : BUG#16456 2006-02-16 jmiller
 rpl_until                : BUG#15886 2006-02-16 jmiller Unstable test case

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

scripts/make_win_src_distribution.sh

@@ -184,7 +184,7 @@ rm -r -f "$BASE/share/Makefile"
 rm -r -f "$BASE/share/Makefile.in"
 rm -r -f "$BASE/share/Makefile.am"
 
-mkdir $BASE/Docs $BASE/extra $BASE/include $BASE/storage
+mkdir $BASE/Docs $BASE/extra $BASE/include
 
 #
 # Copy directory files
@@ -251,7 +251,7 @@ copy_dir_dirs() {
 
 for i in client dbug extra storage/heap include storage/archive storage/csv \
          include/mysql libmysql libmysqld storage/myisam storage/example \
-         storage/myisammrg mysys regex sql strings sql-common sql/examples \
+         storage/myisammrg mysys regex sql strings sql-common \
          tools vio zlib
 do
   copy_dir_files $i
@@ -260,7 +260,7 @@ done
 #
 # Create project files for ndb
 #
-make -C $SOURCE/storage/ndb windoze
+#make -C $SOURCE/storage/ndb windoze
 
 #
 # Input directories to be copied recursively
@@ -298,8 +298,6 @@ do
   fi
 done
 
-cp extra/sql_state.h extra/mysqld_error.h $BASE/include
-
 #
 # support files
 #
@@ -350,8 +348,6 @@ find $BASE \( -name "*.cnf" -o -name "*.ini" \
   do
     unix_to_dos $v
   done
-# File extension '.txt' matches too many other files, error messages etc.
-unix_to_dos $BASE/Docs/*.txt 
 
 mv $BASE/README $BASE/README.txt
 

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 */