Manual merge

6e06100b · igor@rurik.mysql.com · 9d785cd5 · cdb40830 · 6e06100b · 6e06100b
Commit 6e06100b authored Feb 11, 2005 by igor@rurik.mysql.com
Expand all Show 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