From: sasha
Date: June 12 2001 8:06pm
Subject: bk commit into 3.23 tree
List-Archive: http://lists.mysql.com/internals/908
Message-Id: <200106122006.f5CK68U23093@mysql.sashanet.com>

Below is the list of changes that have just been pushed into main
3.23. 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@stripped

ChangeSet@stripped, 2001-06-12 14:06:05-06:00, sasha@stripped
  BitKeeper/triggers/post-commit
      fixed post-commit message
  mysql-test/t/check.test
      fixed bug from 3.23 merge

  mysql-test/t/check.test
    1.2 01/06/12 14:06:04 sasha@stripped +1 -0
    fixed bug from 3.23 merge

  BitKeeper/triggers/post-commit
    1.15 01/06/12 14:06:03 sasha@stripped +2 -3
    fixed post-commit message

# This is a BitKeeper patch.  What follows are the unified diffs for the
# set of deltas contained in the patch.  The rest of the patch, the part
# that BitKeeper cares about, is below these diffs.
# User:	sasha
# Host:	mysql.sashanet.com
# Root:	/home/sasha/src/bk/mysql-4.0

--- 1.14/BitKeeper/triggers/post-commit	Tue Jun 12 06:12:34 2001
+++ 1.15/BitKeeper/triggers/post-commit	Tue Jun 12 14:06:03 2001
@@ -35,12 +35,11 @@
 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@stripped
 
 EOF
   bk changes -v -r+

--- 1.1/mysql-test/t/check.test	Mon Jun 11 20:26:21 2001
+++ 1.2/mysql-test/t/check.test	Tue Jun 12 14:06:04 2001
@@ -15,4 +15,5 @@
 insert into t1 values (200000);
 connection con1;
 reap;
+drop table t1;