Merge zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.1-comeng-unification

into  zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.1-recentcommmerge


BitKeeper/deleted/.del-ha_berkeley.cc:
  Auto merged
BitKeeper/deleted/.del-mysqld.vcproj~6aa7b3f9c3e28fcb:
  Auto merged
BitKeeper/triggers/post-commit:
  Auto merged
client/mysqlcheck.c:
  Auto merged
include/config-win.h:
  Auto merged
include/my_dbug.h:
  Auto merged
libmysqld/Makefile.am:
  Auto merged
mysql-test/r/func_in.result:
  Auto merged
mysql-test/r/information_schema.result:
  Auto merged
mysql-test/r/information_schema_db.result:
  Auto merged
mysql-test/t/func_in.test:
  Auto merged
mysql-test/t/information_schema.test:
  Auto merged
sql/Makefile.am:
  Auto merged
sql/ha_ndbcluster.cc:
  Auto merged
sql/item_cmpfunc.cc:
  Auto merged
sql/item_func.cc:
  Auto merged
sql/lock.cc:
  Auto merged
sql/log_event.cc:
  Auto merged
sql/repl_failsafe.cc:
  Auto merged
sql/set_var.h:
  Auto merged
sql/sp_head.cc:
  Auto merged
sql/sql_base.cc:
  Auto merged
sql/sql_class.h:
  Auto merged
sql/sql_delete.cc:
  Auto merged
sql/sql_insert.cc:
  Auto merged
sql/sql_lex.cc:
  Auto merged
sql/sql_prepare.cc:
  Auto merged
sql/sql_repl.cc:
  Auto merged
sql/sql_view.cc:
  Auto merged
sql/structs.h:
  Auto merged
sql/table.h:
  Auto merged
storage/archive/ha_archive.cc:
  Auto merged
storage/myisam/ha_myisam.cc:
  Auto merged
storage/myisam/mi_open.c:
  Auto merged
storage/myisammrg/ha_myisammrg.cc:
  Auto merged
storage/ndb/src/common/util/File.cpp:
  Auto merged
configure.in:
  Manual merge.
sql/CMakeLists.txt:
  Manual merge.
sql/mysql_priv.h:
  Manual merge.
sql/mysqld.cc:
  Manual merge.
sql/set_var.cc:
  Manual merge.
sql/slave.cc:
  Manual merge.
sql/sql_cache.cc:
  Manual merge.
sql/sql_class.cc:
  Manual merge.
sql/sql_lex.h:
  Manual merge.
sql/sql_parse.cc:
  Manual merge.
sql/sql_select.cc:
  Manual merge.
sql/sql_show.cc:
  Manual merge.
sql/sql_table.cc:
  Manual merge.
sql/sql_update.cc:
  Manual merge.
sql/sql_yacc.yy:
  Manual merge.

4 files changed, 24 insertions, 25 deletions

diff --git a/BitKeeper/triggers/post-commit b/BitKeeper/triggers/post-commit
index b4dcb311dde..8376b9e0631 100755
--- a/BitKeeper/triggers/post-commit
+++ b/BitKeeper/triggers/post-commit
@@ -33,6 +33,13 @@ then
   exit
 fi
 
+IS_MERGE=`bk changes -r+ -k -m`
+if [ "$IS_MERGE" = "" ]
+then
+  echo Merge changeset, not sending mails
+  exit
+fi
+
 CHANGESET=`bk -R prs -r+ -h -d':P:::I:' ChangeSet`
 CSETKEY=`bk -R prs -r+ -h -d':KEY:' ChangeSet`
 #
@@ -48,44 +55,35 @@ WL=`bk -R prs -r+ -h -d':C:' ChangeSet | \
               s/.*\(WL#[0-9][0-9]*\)/ \1/p'`
 if [ "$BUG" = "" ]
 then
-  TO=dev-public@mysql.com
+#  TO=dev-public@mysql.com
   BS=""
   BH=""
 else
-  TO=dev-bugs@mysql.com
+#  TO=dev-bugs@mysql.com
   BS=" BUG#$BUG"
 # need newline here
   BH="X-Bug: $BUG
 "
 fi
+
 #++
-# dev-public@ / dev-bugs@
+# commits@ or dev-private@ mail
 #--
- echo "Commit successful, notifying developers at $TO"
- (
-   cat <<EOF
-List-ID: <bk.mysql-$VERSION>
-From: $FROM
-To: $TO
-Subject: bk commit - $VERSION tree ($CHANGESET)${BS}${WL}
-X-CSetKey: <$CSETKEY>
-$BH
-EOF
-  bk changes -v -r+
-  bk rset -r+ -ah | bk gnupatch -h -dup -T
- ) > $BKROOT/BitKeeper/tmp/dev_public.txt
 
-$SENDMAIL -t < $BKROOT/BitKeeper/tmp/dev_public.txt
+LIST="commits"
+TO="commits@lists.mysql.com"
+if [ -f .tree-is-private ]
+then
+  LIST="dev-private"
+  TO="dev-private@mysql.com"
+fi
 
-#++
-# commits@ mail
-#--
- echo "Notifying commits list at $COMMITS"
+ echo "Notifying $LIST list at $TO"
  (
    cat <<EOF
 List-ID: <bk.mysql-$VERSION>
 From: $FROM
-To: $COMMITS
+To: $TO
 Subject: bk commit into $VERSION tree ($CHANGESET)$BS
 X-CSetKey: <$CSETKEY>
 $BH
@@ -98,7 +96,7 @@ see http://dev.mysql.com/doc/mysql/en/installing-source-tree.html
 
 EOF
   bk changes -v -r+
-  bk cset -r+ -d
+  bk rset -r+ -ah | bk gnupatch -h -dup -T
  ) | bk sed -e ${LIMIT}q > $BKROOT/BitKeeper/tmp/commits.txt
 
 $SENDMAIL -t < $BKROOT/BitKeeper/tmp/commits.txt
@@ -120,7 +118,7 @@ Subject: bk commit - $VERSION tree (Manual) ($CHANGESET)$BS
 
 EOF
   bk changes -v -r+
-  bk cset -r+ -d
+  bk rset -r+ -ah | bk gnupatch -h -dup -T
  ) > $BKROOT/BitKeeper/tmp/docs.txt
  $SENDMAIL -t < $BKROOT/BitKeeper/tmp/docs.txt
  fi
diff --git a/BitKeeper/triggers/pre-commit b/BitKeeper/triggers/pre-commit
index 524321e8b80..f4664ccf1fe 100755
--- a/BitKeeper/triggers/pre-commit
+++ b/BitKeeper/triggers/pre-commit
@@ -20,4 +20,3 @@ then
  echo "Set REAL_EMAIL and retry."
  exit 1
 fi
-
diff --git a/BitKeeper/triggers/pre-outgoing.crash-protect.pl b/BitKeeper/triggers/pre-outgoing.crash-protect.pl
index 80567012c0f..b83e356e3f8 100755
--- a/BitKeeper/triggers/pre-outgoing.crash-protect.pl
+++ b/BitKeeper/triggers/pre-outgoing.crash-protect.pl
@@ -47,6 +47,7 @@ my @bad_csets=
       'stewart@mysql.com|ChangeSet|20060525073521|11169',
       'stewart@mysql.com|ChangeSet|20060605154220|12975',
       'stewart@mysql.com|ChangeSet|20060606040001|15337',
+      'hartmut@mysql.com/linux.site|ChangeSet|20070413121444|50289'
       );
 
 # Read the list of changesets.
diff --git a/BitKeeper/triggers/pre-resolve.crash-protect.pl b/BitKeeper/triggers/pre-resolve.crash-protect.pl
index 80567012c0f..b83e356e3f8 100755
--- a/BitKeeper/triggers/pre-resolve.crash-protect.pl
+++ b/BitKeeper/triggers/pre-resolve.crash-protect.pl
@@ -47,6 +47,7 @@ my @bad_csets=
       'stewart@mysql.com|ChangeSet|20060525073521|11169',
       'stewart@mysql.com|ChangeSet|20060605154220|12975',
       'stewart@mysql.com|ChangeSet|20060606040001|15337',
+      'hartmut@mysql.com/linux.site|ChangeSet|20070413121444|50289'
       );
 
 # Read the list of changesets.