Merge with 4.0.4

BitKeeper/etc/logging_ok:
  auto-union
client/mysqldump.c:
  Auto merged
include/Makefile.am:
  Auto merged
include/my_base.h:
  Auto merged
include/my_sys.h:
  Auto merged
include/sslopt-case.h:
  Auto merged
libmysql/libmysql.c:
  Auto merged
libmysql/libmysql.def:
  Auto merged
libmysqld/lib_sql.cc:
  Auto merged
myisam/ft_boolean_search.c:
  Auto merged
myisam/mi_check.c:
  Auto merged
myisam/mi_create.c:
  Auto merged
myisam/myisamchk.c:
  Auto merged
mysql-test/mysql-test-run.sh:
  Auto merged
mysql-test/r/create.result:
  Auto merged
mysql-test/r/innodb.result:
  Auto merged
mysql-test/r/myisam.result:
  Auto merged
mysql-test/r/select.result:
  Auto merged
mysql-test/r/type_set.result:
  Auto merged
mysql-test/t/create.test:
  Auto merged
mysql-test/t/myisam.test:
  Auto merged
sql/Makefile.am:
  Auto merged
sql/filesort.cc:
  Auto merged
sql/ha_innodb.cc:
  Auto merged
sql/ha_myisam.cc:
  Auto merged
sql/handler.h:
  Auto merged
sql/item_cmpfunc.cc:
  Auto merged
sql/item_strfunc.cc:
  Auto merged
sql/item_strfunc.h:
  Auto merged
sql/lex.h:
  Auto merged
sql/log.cc:
  Auto merged
sql/log_event.cc:
  Auto merged
sql/mysql_priv.h:
  Auto merged
sql/mysqld.cc:
  Auto merged
sql/net_pkg.cc:
  Auto merged
sql/net_serv.cc:
  Auto merged
sql/opt_range.cc:
  Auto merged
sql/set_var.h:
  Auto merged
sql/slave.cc:
  Auto merged
sql/sql_base.cc:
  Auto merged
sql/sql_class.h:
  Auto merged
sql/sql_insert.cc:
  Auto merged
sql/sql_lex.cc:
  Auto merged
sql/sql_lex.h:
  Auto merged
sql/sql_load.cc:
  Auto merged
sql/share/english/errmsg.txt:
  Auto merged
sql/sql_table.cc:
  Auto merged
sql/sql_udf.cc:
  Auto merged
sql/sql_union.cc:
  Auto merged
sql/unireg.h:
  Auto merged
sql/sql_cache.cc:
  Code cleanup (removed ifdef)

2 files changed, 12 insertions, 8 deletions

diff --git a/BitKeeper/etc/logging_ok b/BitKeeper/etc/logging_ok
index 63acc19a75c..31fb7d85fa7 100644
--- a/BitKeeper/etc/logging_ok
+++ b/BitKeeper/etc/logging_ok
@@ -3,6 +3,7 @@ Administrator@co3064164-a.rochd1.qld.optushome.com.au
 Administrator@fred.
 Miguel@light.local
 Sinisa@sinisa.nasamreza.org
+WAX@sergbook.mysql.com
 ahlentz@co3064164-a.rochd1.qld.optusnet.com.au
 akishkin@work.mysql.com
 arjen@co3064164-a.bitbike.com
@@ -10,6 +11,7 @@ arjen@fred.bitbike.com
 arjen@george.bitbike.com
 bar@bar.mysql.r18.ru
 bar@bar.udmsearch.izhnet.ru
+bar@gw.udmsearch.izhnet.ru
 bell@sanja.is.com.ua
 davida@isil.mysql.com
 heikki@donna.mysql.fi
@@ -53,6 +55,7 @@ paul@central.snake.net
 paul@teton.kitebird.com
 peter@linux.local
 peter@mysql.com
+ram@gw.udmsearch.izhnet.ru
 ram@ram.(none)
 root@x3.internalnet
 salle@geopard.(none)
@@ -62,6 +65,7 @@ serg@build.mysql2.com
 serg@serg.mysql.com
 serg@sergbook.mysql.com
 sinisa@rhols221.adsl.netsonic.fi
+tfr@beta.frontier86.ee
 tfr@indrek.tfr.cafe.ee
 tfr@sarvik.tfr.cafe.ee
 tim@bitch.mysql.fi
@@ -75,6 +79,7 @@ tonu@hundin.mysql.fi
 tonu@volk.internalnet
 tonu@x153.internalnet
 tonu@x3.internalnet
+venu@myvenu.com
 venu@work.mysql.com
 vva@genie.(none)
 walrus@mysql.com
@@ -82,4 +87,3 @@ worm@altair.is.lan
 zak@balfor.local
 zak@linux.local
 zgreant@mysql.com
-tfr@beta.frontier86.ee
diff --git a/BitKeeper/triggers/post-commit b/BitKeeper/triggers/post-commit
index 50562ba5cc9..f8ab599fc98 100755
--- a/BitKeeper/triggers/post-commit
+++ b/BitKeeper/triggers/post-commit
@@ -25,10 +25,10 @@ then
  echo "Commit successful, notifying developers at $TO"
  (
    cat <<EOF
-List-ID: <bk.mysql-4.0>
+List-ID: <bk.mysql-4.1>
 From: $FROM
 To: $TO
-Subject: bk commit - 4.0 tree
+Subject: bk commit - 4.1 tree
 
 EOF
   bk changes -v -r+
@@ -41,13 +41,13 @@ EOF
  echo "Notifying internals list at $INTERNALS"
  (
    cat <<EOF
-List-ID: <bk.mysql-4.0>
+List-ID: <bk.mysql-4.1>
 From: $FROM
 To: $INTERNALS
-Subject: bk commit into 4.0 tree
+Subject: bk commit into 4.1 tree
 
 Below is the list of changes that have just been committed into a local
-4.0 repository of $USER. When $USER does a push these changes will
+4.1 repository of $USER. When $USER does a push these changes will
 be propagated to the main repository and, within 24 hours after the
 push, to the public repository.
 For information on how to access the public repository
@@ -68,10 +68,10 @@ EOF
   echo "Notifying docs list at $DOCS"
   (
     cat <<EOF
-List-ID: <bk.mysql-4.0>
+List-ID: <bk.mysql-4.1>
 From: $FROM
 To: $DOCS
-Subject: bk commit - 4.0 tree (Manual)
+Subject: bk commit - 4.1 tree (Manual)
 
 EOF
   bk changes -v -r+