Commit ed0badb1 authored by unknown's avatar unknown
Browse files

Merge bk-internal:/home/bk/mysql-5.1-new-maint 

into  pilot.blaudden:/home/msvensson/mysql/mysql-5.1-maint


BitKeeper/etc/ignore:
  auto-union
BitKeeper/deleted/.del-init_db.sql~e2b8d0c8390e8023:
  Auto merged
BitKeeper/deleted/.del-test_db.sql:
  Auto merged
include/my_pthread.h:
  Auto merged
mysql-test/mysql-test-run.pl:
  Auto merged
scripts/make_binary_distribution.sh:
  Auto merged
sql/log.cc:
  Auto merged
sql/mysql_priv.h:
  Auto merged
sql/sql_acl.h:
  Auto merged
mysql-test/install_test_db.sh:
  Manual merge
mysql-test/r/flush2.result:
  Manual merge
netware/Makefile.am:
  Manual merge
parents 4727c00f 94a40d6c

BUILD/FINISH.sh

+1 −1
Original line number Diff line number Diff line
@@ -4,7 +4,7 @@ extra_configs="$extra_configs $local_infile_configs" 
configure="./configure $base_configs $extra_configs"



commands="\

$make -k distclean || true 

$make -k maintainer-clean || true 

/bin/rm -rf */.deps/*.P configure config.cache storage/*/configure storage/*/config.cache autom4te.cache storage/*/autom4te.cache;



path=`dirname $0`

BUILD/check-cpu

+4 −0
Original line number Diff line number Diff line
@@ -115,6 +115,10 @@ check_cpu () { 
    *i386*i486*)

      cpu_arg="pentium-m";

      ;;

    #Core 2 Duo  

    *Intel*Core\(TM\)2*)

      cpu_arg="nocona";

      ;;



    # Intel ia64

    *Itanium*)

BUILD/compile-alpha-ccc

+3 −1
Original line number Diff line number Diff line 
#! /bin/sh



/bin/rm -f */.deps/*.P */*.o

make -k clean

make -k maintainer-clean

/bin/rm -f */.deps/*.P */*.o

/bin/rm -f config.cache mysql-*.tar.gz

BUILD/compile-alpha-cxx

+3 −1
Original line number Diff line number Diff line 
#! /bin/sh



/bin/rm -f */.deps/*.P */*.o

make -k clean

make -k maintainer-clean

/bin/rm -f */.deps/*.P */*.o

/bin/rm -f */.deps/*.P config.cache storage/innobase/config.cache mysql-*.tar.gz

BUILD/compile-alpha-debug

+3 −1
Original line number Diff line number Diff line 
#! /bin/sh



/bin/rm -f */.deps/*.P */*.o

make -k clean

make -k maintainer-clean

/bin/rm -f */.deps/*.P */*.o

/bin/rm -f */.deps/*.P config.cache storage/innobase/config.cache mysql-*.tar.gz