Manual merge

BitKeeper/triggers/post-commit: Auto merged mysql-test/r/distinct.result: Auto merged mysql-test/r/select.result: Auto merged

Manual merge
BitKeeper/triggers/post-commit: Auto merged mysql-test/r/distinct.result: Auto merged mysql-test/r/select.result: Auto merged
8877372f · unknown · 35e24fcb · 193919aa · 8877372f · 8877372f
Commit 8877372f authored Feb 11, 2005 by unknown
Expand all Hide whitespace changes
Inline Side-by-side

Showing with 261 additions and 827 deletions

BitKeeper/triggers/post-commit BitKeeper/triggers/post-commit +0 -1

sql/table.cc sql/table.cc +261 -826

No files found.
--- a/BitKeeper/triggers/post-commit
+++ b/BitKeeper/triggers/post-commit
@@ -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

--- a/sql/table.cc
+++ b/sql/table.cc