Commit 2a2b0dcf authored by unknown's avatar unknown
Browse files

Manual merge 


BitKeeper/triggers/post-commit:
  Auto merged
mysql-test/r/distinct.result:
  Auto merged
mysql-test/r/select.result:
  Auto merged
parents 0e9b1c1d 6cb5736b

BitKeeper/triggers/post-commit

+0 −1
Original line number Diff line number Diff line
@@ -62,7 +62,6 @@ From: $FROM 
To: $INTERNALS

Subject: bk commit into $VERSION tree ($CHANGESET)$BS

$BH



Below is the list of changes that have just been committed into a local

$VERSION repository of $USER. When $USER does a push these changes will

be propagated to the main repository and, within 24 hours after the

sql/table.cc

+261 −826

File changed.

Preview size limit exceeded, changes collapsed.