summaryrefslogtreecommitdiff
path: root/BitKeeper
diff options
context:
space:
mode:
authorcmiller@zippy.cornsilk.net <>2007-01-31 16:14:12 -0500
committercmiller@zippy.cornsilk.net <>2007-01-31 16:14:12 -0500
commit5a0ac8afe71044cada67f1bed9c9dcae72b37689 (patch)
tree92a8480acf020e5cf0ff0099b9e3bcab8f68302c /BitKeeper
parent50796a040ea10376901b4206471eb0b1c9bfc8be (diff)
parent24e3508b0e3d1ca10a5a8e9db102a506371ebb1c (diff)
downloadmariadb-git-5a0ac8afe71044cada67f1bed9c9dcae72b37689.tar.gz
Merge zippy.cornsilk.net:/home/cmiller/work/mysql/bug25341/my50-bug25341
into zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.0-maint
Diffstat (limited to 'BitKeeper')
-rw-r--r--BitKeeper/etc/collapsed6
1 files changed, 6 insertions, 0 deletions
diff --git a/BitKeeper/etc/collapsed b/BitKeeper/etc/collapsed
index 2c730ee5808..e92ccf9aa73 100644
--- a/BitKeeper/etc/collapsed
+++ b/BitKeeper/etc/collapsed
@@ -30,6 +30,12 @@
4554b3722d71SbPiI2Gx-RhbZjmuIQ
4558b3d73Cxjlb7Wv1oytdSTthxDfw
45771031yRCoM_ZfONdYchPvVEgLRg
+459a60d8rIxeTuhB3j_QsOwLGdcpng
+459a61c9OS8PzIsdviZJDkybJ1y1uA
+459a70691aYIfU2ohV0a3P5iTLpO2A
+459a7422KF_P7PuU3YQ5qG6ZLEVpiA
+459a74e4nRcXppMSBYeQQ5efDkTADg
45ae6628gqKTsUFfnoNExadETVIkbA
45ba4faf2oqu6eR8fqecR3LfSNcYUg
45ba5238-NKl80QVXzdGo8hO9M75Xg
+45c0fdfb2mz6NdOIsLenJtf6_ZelTA