Commit 8b110160 authored by unknown's avatar unknown
Browse files

Merge bk-internal.mysql.com:/home/bk/mysql-5.1 

into  janus.mylan:/usr/home/serg/Abk/mysql-5.1


include/my_global.h:
  Auto merged
sql/ha_ndbcluster.cc:
  Auto merged
sql/ha_partition.cc:
  Auto merged
sql/handler.cc:
  Auto merged
sql/item_subselect.cc:
  Auto merged
sql/log.cc:
  Auto merged
sql/log_event.cc:
  Auto merged
sql/mysql_priv.h:
  Auto merged
sql/opt_range.cc:
  Auto merged
sql/slave.cc:
  Auto merged
sql/slave.h:
  Auto merged
sql/sp.cc:
  Auto merged
sql/sql_acl.cc:
  Auto merged
sql/sql_insert.cc:
  Auto merged
sql/sql_select.cc:
  Auto merged
sql/sql_select.h:
  Auto merged
sql/sql_servers.cc:
  Auto merged
sql/table.cc:
  Auto merged
sql/table.h:
  Auto merged
sql/tztime.cc:
  Auto merged
storage/heap/ha_heap.cc:
  Auto merged
storage/innobase/handler/ha_innodb.cc:
  Auto merged
storage/myisam/ha_myisam.cc:
  Auto merged
storage/myisammrg/ha_myisammrg.h:
  Auto merged
parents 917cec71 b64a4060

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

BUILD/compile-dist

+1 −1
Original line number Diff line number Diff line
@@ -6,7 +6,7 @@ 
# tree can then be picked up by "make dist" to create the "pristine source

# package" that is used as the basis for all other binary builds.

#

test -f Makefile && make distclean

test -f Makefile && make maintainer-clean

(cd storage/innobase && aclocal && autoheader && \

    libtoolize --automake --force --copy && \

    automake --force --add-missing --copy && autoconf)