1
0
mirror of https://github.com/MariaDB/server.git synced 2025-07-29 05:21:33 +03:00

Manual merge

BitKeeper/triggers/post-commit:
  Auto merged
mysql-test/r/distinct.result:
  Auto merged
mysql-test/r/select.result:
  Auto merged
This commit is contained in:
unknown
2005-02-11 18:14:44 -08:00
2 changed files with 263 additions and 829 deletions

View File

@ -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