summaryrefslogtreecommitdiff
path: root/BitKeeper
diff options
context:
space:
mode:
authorcmiller@zippy.cornsilk.net <>2007-09-10 08:06:27 -0400
committercmiller@zippy.cornsilk.net <>2007-09-10 08:06:27 -0400
commitcf74e43f1583a81016f0ce6cbbe087b38853b5cd (patch)
tree778fee9432c6a68f033c652aa8b4d32b49a0e4f3 /BitKeeper
parentf4b671d8bc1ab80342918820a2bc841c5542d57d (diff)
parent1f1d673200b312b85739f455c74c25c399f1cc93 (diff)
downloadmariadb-git-cf74e43f1583a81016f0ce6cbbe087b38853b5cd.tar.gz
Merge bk-internal.mysql.com:/home/bk/mysql-5.0
into zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.0-community
Diffstat (limited to 'BitKeeper')
-rw-r--r--BitKeeper/etc/collapsed16
-rwxr-xr-xBitKeeper/triggers/post-commit2
2 files changed, 17 insertions, 1 deletions
diff --git a/BitKeeper/etc/collapsed b/BitKeeper/etc/collapsed
index 8dcf561b845..64dfcb27d17 100644
--- a/BitKeeper/etc/collapsed
+++ b/BitKeeper/etc/collapsed
@@ -35,9 +35,25 @@
459a70691aYIfU2ohV0a3P5iTLpO2A
459a7422KF_P7PuU3YQ5qG6ZLEVpiA
459a74e4nRcXppMSBYeQQ5efDkTADg
+459c03b9N_mqF2XJKK6DwSrIt7e6_g
+459c1965_BQMBzBO8S_gVqjTHYQrmw
+459c2098XoAUsUn8N07IVRDD6CTM-A
+459ea845XenN-uWqEM5LFvUT60tW_A
45ae6628gqKTsUFfnoNExadETVIkbA
+45af88c9RIIJWPfBxs3o7zekI-ELPQ
45ba4faf2oqu6eR8fqecR3LfSNcYUg
45ba5238-NKl80QVXzdGo8hO9M75Xg
45c0fdfb2mz6NdOIsLenJtf6_ZelTA
+45c38d90tNwOTSaYKHXd3ccLtnytlQ
+45c390d6BbWrwyEi5T5VsWKYxl06Rg
+45c39d31g0iik6UE_oTK5N55ry-ycA
45d1ffcd-r3v8A7uh92hQaMfQM9UPQ
45d21437Vg_-i4uOWyvzYWHESXDP6A
+45da6370nnZlAAIieMCrXkxF9toOyQ
+45da6551zUuplwxuqcT2fhRgceC0CQ
+45db0d4bkGtxBk21sZFJgbCV1FcNRg
+45db468b-DKE8kUTV42eYMYmk8_g9g
+45dd21d1rVPnDfvZTNVHLalcjnbsZw
+45ddaf15_Ld7IAEpUUP3FJjJ-oSEFg
+45ddc763DodLG1BqH_wRBJXMbCSB5A
+45ddc8282KnaNGuijqCTphlXV_eeog
diff --git a/BitKeeper/triggers/post-commit b/BitKeeper/triggers/post-commit
index 865d7cdac92..ed34ea1a46e 100755
--- a/BitKeeper/triggers/post-commit
+++ b/BitKeeper/triggers/post-commit
@@ -5,7 +5,7 @@ FROM=$USER@mysql.com
COMMITS=commits@lists.mysql.com
DOCS=docs-commit@mysql.com
LIMIT=10000
-VERSION="5.0"
+VERSION="5.0-community"
BKROOT=`bk root`
if [ -x /usr/sbin/sendmail ]; then