summaryrefslogtreecommitdiff
path: root/BitKeeper
diff options
context:
space:
mode:
authorcmiller@zippy.cornsilk.net <>2006-12-22 16:02:54 -0500
committercmiller@zippy.cornsilk.net <>2006-12-22 16:02:54 -0500
commit8ffe6fb522988aa55ba186f093dc59fbc6fb5995 (patch)
treef8e4ebcfafcd35bbf04666606c2c50a9409ffae0 /BitKeeper
parent381a79f72c1384907fd2151b0b37658fef8ff72c (diff)
parent50726b2322edac8e93489fcb5ef75a5634222d44 (diff)
downloadmariadb-git-8ffe6fb522988aa55ba186f093dc59fbc6fb5995.tar.gz
Merge zippy.cornsilk.net:/home/cmiller/work/mysql/bug22555/my50-bug22555
into zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.0-maint
Diffstat (limited to 'BitKeeper')
-rw-r--r--BitKeeper/etc/collapsed1
1 files changed, 1 insertions, 0 deletions
diff --git a/BitKeeper/etc/collapsed b/BitKeeper/etc/collapsed
index 5ff033b2163..951d894c5b6 100644
--- a/BitKeeper/etc/collapsed
+++ b/BitKeeper/etc/collapsed
@@ -29,3 +29,4 @@
4554a95d7txO1DuO9G3nAizI3SkFAA
4554b3722d71SbPiI2Gx-RhbZjmuIQ
4558b3d73Cxjlb7Wv1oytdSTthxDfw
+45771031yRCoM_ZfONdYchPvVEgLRg