From 86d88318f55fbd4b32d14e8bc73c8ed6dbb96246 Mon Sep 17 00:00:00 2001
From: "sasha@mysql.sashanet.com" <>
Date: Tue, 12 Jun 2001 14:06:05 -0600
Subject: [PATCH] BitKeeper/triggers/post-commit     fixed post-commit message
 mysql-test/t/check.test     fixed bug from 3.23 merge

---
 BitKeeper/triggers/post-commit | 5 ++---
 mysql-test/t/check.test        | 1 +
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/BitKeeper/triggers/post-commit b/BitKeeper/triggers/post-commit
index 6639366f622..68cb64266a8 100755
--- a/BitKeeper/triggers/post-commit
+++ b/BitKeeper/triggers/post-commit
@@ -35,12 +35,11 @@ EOF
 List-ID: <bk.mysql>
 From: $FROM
 To: $INTERNALS
-Subject: bk commit into 3.23 tree
+Subject: bk commit into 4.0 tree
 
 Below is the list of changes that have just been pushed into main
-3.23. repository. For information on how to access the repository
+4.0 repository. For information on how to access the repository
 see http://www.mysql.com/doc/I/n/Installing_source_tree.html
->>>>>>> BitKeeper/tmp/post-commit_sasha@1.8.1.3
 
 EOF
   bk changes -v -r+
diff --git a/mysql-test/t/check.test b/mysql-test/t/check.test
index e65a61d86da..6296b31d65d 100644
--- a/mysql-test/t/check.test
+++ b/mysql-test/t/check.test
@@ -15,4 +15,5 @@ connection con2;
 insert into t1 values (200000);
 connection con1;
 reap;
+drop table t1;