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

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


dbug/dbug.c:
  Auto merged
include/my_base.h:
  Auto merged
include/my_global.h:
  Auto merged
sql/event_db_repository.cc:
  Auto merged
sql/ha_ndbcluster.cc:
  Auto merged
sql/ha_ndbcluster.h:
  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.h:
  Auto merged
sql/opt_sum.cc:
  Auto merged
sql/slave.cc:
  Auto merged
sql/slave.h:
  Auto merged
sql/sp.cc:
  Auto merged
sql/sql_insert.cc:
  Auto merged
sql/sql_plugin.cc:
  Auto merged
sql/sql_select.cc:
  Auto merged
sql/sql_servers.cc:
  Auto merged
sql/sql_servers.h:
  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/myisammrg/ha_myisammrg.cc:
  Auto merged
support-files/Makefile.am:
  Auto merged
sql/opt_range.cc:
  manual merge
storage/example/ha_example.cc:
  manual merge
storage/federated/ha_federated.cc:
  manual merge
storage/myisam/ha_myisam.cc:
  manual merge
storage/myisam/mi_rkey.c:
  manual merge

11 files changed, 19 insertions, 11 deletions

diff --git a/BUILD/FINISH.sh b/BUILD/FINISH.sh
index 6f0600c9de3..142ff7eb08e 100644
--- a/BUILD/FINISH.sh
+++ b/BUILD/FINISH.sh
@@ -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`
diff --git a/BUILD/compile-alpha-ccc b/BUILD/compile-alpha-ccc
index 889592295b5..59ed241d51c 100755
--- a/BUILD/compile-alpha-ccc
+++ b/BUILD/compile-alpha-ccc
@@ -1,5 +1,7 @@
+#! /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
 
diff --git a/BUILD/compile-alpha-cxx b/BUILD/compile-alpha-cxx
index 1624f4ed622..a1b5605ac5e 100755
--- a/BUILD/compile-alpha-cxx
+++ b/BUILD/compile-alpha-cxx
@@ -1,5 +1,7 @@
+#! /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
 
diff --git a/BUILD/compile-alpha-debug b/BUILD/compile-alpha-debug
index b565a18272f..94fe8a2b414 100755
--- a/BUILD/compile-alpha-debug
+++ b/BUILD/compile-alpha-debug
@@ -1,5 +1,7 @@
+#! /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
 
diff --git a/BUILD/compile-dist b/BUILD/compile-dist
index 0504b308ceb..0ecb386bf71 100755
--- a/BUILD/compile-dist
+++ b/BUILD/compile-dist
@@ -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)
diff --git a/BUILD/compile-hpux11-parisc2-aCC b/BUILD/compile-hpux11-parisc2-aCC
index c286488bb26..0e825715663 100755
--- a/BUILD/compile-hpux11-parisc2-aCC
+++ b/BUILD/compile-hpux11-parisc2-aCC
@@ -61,7 +61,7 @@ done
 
 
 set -x
-make distclean
+make maintainer-clean
 
 path=`dirname $0`
 . "$path/autorun.sh"
diff --git a/BUILD/compile-ia64-debug-max b/BUILD/compile-ia64-debug-max
index d1017ad506b..123bfb06300 100755
--- a/BUILD/compile-ia64-debug-max
+++ b/BUILD/compile-ia64-debug-max
@@ -1,4 +1,4 @@
-gmake -k clean || true 
+gmake -k maintainer-clean || true 
 /bin/rm -f */.deps/*.P config.cache storage/innobase/config.cache
 
 path=`dirname $0`
diff --git a/BUILD/compile-irix-mips64-mipspro b/BUILD/compile-irix-mips64-mipspro
index 0cebb4b9f5b..5e34df20c28 100755
--- a/BUILD/compile-irix-mips64-mipspro
+++ b/BUILD/compile-irix-mips64-mipspro
@@ -33,7 +33,7 @@ else
 fi
 
 set -x
-make distclean
+make maintainer-clean
 
 path=`dirname $0`
 . "$path/autorun.sh"
diff --git a/BUILD/compile-pentium-pgcc b/BUILD/compile-pentium-pgcc
index 411241451cf..c13a6ff14f7 100755
--- a/BUILD/compile-pentium-pgcc
+++ b/BUILD/compile-pentium-pgcc
@@ -1,5 +1,7 @@
+#! /bin/sh
+
 AM_MAKEFLAGS="-j 2"
-gmake -k clean || true
+gmake -k maintainer-clean || true
 /bin/rm -f */.deps/*.P config.cache
  
 path=`dirname $0`
diff --git a/BUILD/compile-solaris-sparc-forte b/BUILD/compile-solaris-sparc-forte
index 7cdbff6ae4a..43f68acbbcc 100755
--- a/BUILD/compile-solaris-sparc-forte
+++ b/BUILD/compile-solaris-sparc-forte
@@ -1,6 +1,6 @@
 #! /bin/sh
 
-gmake -k clean || true
+gmake -k maintainer-clean || true
 /bin/rm -f */.deps/*.P config.cache
  
 path=`dirname $0`
diff --git a/BUILD/compile-solaris-sparc-purify b/BUILD/compile-solaris-sparc-purify
index 8c24b0db98c..547d1b69d68 100755
--- a/BUILD/compile-solaris-sparc-purify
+++ b/BUILD/compile-solaris-sparc-purify
@@ -31,7 +31,7 @@ do
   shift
 done
 
-gmake -k clean || true 
+gmake -k maintainer-clean || true 
 /bin/rm -f */.deps/*.P config.cache
  
 path=`dirname $0`