Commit 86d88318 authored by sasha@mysql.sashanet.com's avatar sasha@mysql.sashanet.com
Browse files

BitKeeper/triggers/post-commit

    fixed post-commit message
mysql-test/t/check.test
    fixed bug from 3.23 merge
parent 0652902a
Loading
Loading
Loading
Loading
+2 −3
Original line number Diff line number Diff line
@@ -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+
+1 −0
Original line number Diff line number Diff line
@@ -15,4 +15,5 @@ connection con2;
insert into t1 values (200000);
connection con1;
reap;
drop table t1;