Merge with 4.0.6

BitKeeper/etc/ignore:
  auto-union
acinclude.m4:
  Auto merged
configure.in:
  Auto merged
heap/hp_delete.c:
  Auto merged
heap/hp_scan.c:
  Auto merged
include/my_base.h:
  Auto merged
libmysql/libmysql.c:
  Auto merged
libmysqld/lib_sql.cc:
  Auto merged
myisam/mi_check.c:
  Auto merged
myisam/mi_rnext_same.c:
  Auto merged
myisam/sort.c:
  Auto merged
mysql-test/r/alter_table.result:
  Auto merged
mysql-test/r/distinct.result:
  Auto merged
mysql-test/r/func_math.result:
  Auto merged
mysql-test/r/group_by.result:
  Auto merged
mysql-test/r/innodb.result:
  Auto merged
mysql-test/r/select.result:
  Auto merged
mysql-test/t/group_by.test:
  Auto merged
mysql-test/t/select.test:
  Auto merged
mysys/hash.c:
  Auto merged
sql/field.h:
  Auto merged
sql/field_conv.cc:
  Auto merged
sql/ha_innodb.cc:
  Auto merged
sql/handler.cc:
  Auto merged
sql/item_func.cc:
  Auto merged
sql/item_func.h:
  Auto merged
sql/log.cc:
  Auto merged
sql/mysql_priv.h:
  Auto merged
sql/mysqld.cc:
  Auto merged
sql/opt_sum.cc:
  Auto merged
sql/set_var.cc:
  Auto merged
sql/set_var.h:
  Auto merged
sql/sql_analyse.cc:
  Auto merged
sql/sql_class.cc:
  Auto merged
sql/sql_show.cc:
  Auto merged
sql/sql_table.cc:
  Auto merged
sql/sql_udf.cc:
  Auto merged
sql/structs.h:
  Auto merged
sql/uniques.cc:
  Auto merged
strings/strto.c:
  Auto merged
vio/vio.c:
  Auto merged
BitKeeper/triggers/post-commit:
  Add changeset to commit messages
sql-bench/crash-me.sh:
  Use version from 4.0
sql-bench/server-cfg.sh:
  Use version from 4.0

1 files changed, 22 insertions, 11 deletions

diff --git a/.bzrignore b/.bzrignore
index f0fcf652045..20d6e35bb62 100644
--- a/.bzrignore
+++ b/.bzrignore
@@ -75,6 +75,9 @@ Makefile.in'
 PENDING/*
 TAGS
 aclocal.m4
+autom4te-2.53.cache/output.0
+autom4te-2.53.cache/requests
+autom4te-2.53.cache/traces.0
 autom4te.cache/*
 autom4te.cache/output.0
 autom4te.cache/requests
@@ -123,6 +126,9 @@ bdb/db/crdel_auto.c
 bdb/db/db_auto.c
 bdb/dbinc_auto/*.*
 bdb/dbreg/dbreg_auto.c
+bdb/dist/autom4te-2.53.cache/output.0
+bdb/dist/autom4te-2.53.cache/requests
+bdb/dist/autom4te-2.53.cache/traces.0
 bdb/dist/autom4te.cache/*
 bdb/dist/autom4te.cache/output.0
 bdb/dist/autom4te.cache/requests
@@ -205,6 +211,14 @@ bdb/test/include.tcl
 bdb/test/logtrack.list
 bdb/txn/txn_auto.c
 binary/*
+bkpull.log
+bkpull.log.2
+bkpull.log.3
+bkpull.log.4
+bkpull.log.5
+bkpull.log.6
+bkpush.log
+build.log
 client/insert_test
 client/log_event.cc
 client/log_event.h
@@ -232,6 +246,7 @@ config.status
 configure
 configure.lineno
 core
+core.2430
 db-*.*.*
 dbug/user.t
 depcomp
@@ -249,6 +264,9 @@ include/my_config.h
 include/my_global.h
 include/mysql_version.h
 include/widec.h
+innobase/autom4te-2.53.cache/output.0
+innobase/autom4te-2.53.cache/requests
+innobase/autom4te-2.53.cache/traces.0
 innobase/autom4te.cache/*
 innobase/autom4te.cache/output.0
 innobase/autom4te.cache/requests
@@ -313,6 +331,7 @@ libmysqld/item_buff.cc
 libmysqld/item_cmpfunc.cc
 libmysqld/item_create.cc
 libmysqld/item_func.cc
+libmysqld/item_row.cc
 libmysqld/item_strfunc.cc
 libmysqld/item_sum.cc
 libmysqld/item_timefunc.cc
@@ -448,6 +467,7 @@ mysys/test_thr_alarm
 mysys/test_thr_lock
 mysys/test_vsnprintf
 mysys/testhash
+pull.log
 regex/re
 repl-tests/test-repl-ts/repl-timestamp.master.reject
 repl-tests/test-repl/foo-dump-slave.master.
@@ -515,6 +535,7 @@ sql/mysqld-purecov
 sql/mysqld-purify
 sql/mysqld-quantify
 sql/new.cc
+sql/safe_to_cache_query.txt
 sql/share/*.sys
 sql/share/charsets/gmon.out
 sql/share/gmon.out
@@ -524,6 +545,7 @@ sql/share/norwegian/errmsg.sys
 sql/sql_select.cc.orig
 sql/sql_yacc.cc
 sql/sql_yacc.h
+sql/sql_yacc.output
 sql/sql_yacc.yy.orig
 sql_error.cc
 sql_prepare.cc
@@ -557,14 +579,3 @@ vio/test-ssl
 vio/test-sslclient
 vio/test-sslserver
 vio/viotest-ssl
-bkpull.log
-bkpull.log.2
-bkpull.log.3
-build.log
-sql/safe_to_cache_query.txt
-bkpull.log.4
-bkpull.log.5
-bkpull.log.6
-bkpush.log
-sql/sql_yacc.output
-libmysqld/item_row.cc