merge

BitKeeper/etc/logging_ok:
  auto-union
mysql-test/mysql-test-run.sh:
  Auto merged
sql/handler.h:
  Auto merged
sql/item.cc:
  Auto merged
sql/mysqld.cc:
  Auto merged
sql/sql_insert.cc:
  Auto merged
sql/sql_lex.cc:
  Auto merged
sql/sql_select.cc:
  Auto merged
sql/sql_yacc.yy:
  Auto merged
sql/table.cc:
  Auto merged
storage/myisam/mi_check.c:
  Auto merged
storage/ndb/src/common/util/version.c:
  Auto merged
storage/ndb/src/ndbapi/ndberror.c:
  Auto merged

scripts/make_binary_distribution.sh

@@ -315,7 +315,7 @@ system=`echo $system | sed -e 's/solaris2.\([0-9]*\)/solaris\1/g'`
 system=`echo $system | sed -e 's/sco3.2v\(.*\)/openserver\1/g'`
 
 # Use the override --machine if present
-if [ -n $MACHINE ] ; then
+if [ -n "$MACHINE" ] ; then
   machine=$MACHINE
 fi
 

scripts/make_win_src_distribution.sh

@@ -199,11 +199,10 @@ copy_dir_files()
        print_debug "Creating directory '$arg'"
        mkdir $BASE/$arg
      fi
-    for i in *.c *.cpp *.h *.ih *.i *.ic *.asm *.def *.hpp *.dsp \
-             README INSTALL* LICENSE *.inc *.test *.result \
-	     *.pem Moscow_leap des_key_file *.dat *.000001 \
-	     *.require *.opt
-
+    for i in *.c *.cpp *.h *.ih *.i *.ic *.asm *.def *.hpp *.dsp *.dsw \
+             README INSTALL* LICENSE AUTHORS NEWS ChangeLog \
+             *.inc *.test *.result *.pem Moscow_leap des_key_file \
+             *.dat *.000001 *.require *.opt
     do
       if [ -f $i ]
       then
@@ -234,6 +233,7 @@ copy_dir_dirs() {
     find $arg -type d \
               -and -not -path \*SCCS\* \
               -and -not -path \*.deps\* \
+              -and -not -path \*.libs\* \
               -and -not -path \*autom4te.cache -print
     )|(
       while read v
@@ -266,7 +266,7 @@ make -C $SOURCE/ndb windoze
 # Input directories to be copied recursively
 #
 
-for i in bdb innobase ndb
+for i in bdb innobase ndb extra/yassl
 do
   copy_dir_dirs $i
 done
@@ -328,6 +328,8 @@ do
       $CP -R $i $BASE/$i
     fi
   fi
+  # But remove object files from destination
+  find $BASE/$i -type f -name \*.o | xargs rm -f
 done
 
 #