1
0
mirror of https://github.com/MariaDB/server.git synced 2025-08-01 03:47:19 +03:00

Manual merge

BitKeeper/triggers/post-commit:
  Auto merged
sql/table.cc:
  Auto merged
This commit is contained in:
unknown
2005-02-11 10:44:03 -08:00
2 changed files with 6 additions and 8 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