summaryrefslogtreecommitdiff
path: root/BitKeeper
diff options
context:
space:
mode:
authorcmiller@zippy.cornsilk.net <>2006-11-13 13:17:02 -0500
committercmiller@zippy.cornsilk.net <>2006-11-13 13:17:02 -0500
commit6d97850c3b47ce8eb7d0f3c70f38d9225bdfd4dd (patch)
treee106587572ba6ee3a8705be2e0a626497dc280f5 /BitKeeper
parent5a049ba8073ea368ca93f509cdd884b7da37f879 (diff)
parent8471897fbc01520bfdf93a7105019e17cdbca89e (diff)
downloadmariadb-git-6d97850c3b47ce8eb7d0f3c70f38d9225bdfd4dd.tar.gz
Merge zippy.cornsilk.net:/home/cmiller/work/mysql/bug18761/my50-bug18761
into zippy.cornsilk.net:/home/cmiller/work/mysql/bug18761/my51-bug18761
Diffstat (limited to 'BitKeeper')
-rw-r--r--BitKeeper/etc/collapsed8
1 files changed, 8 insertions, 0 deletions
diff --git a/BitKeeper/etc/collapsed b/BitKeeper/etc/collapsed
index 311c3813abf..357e2c84566 100644
--- a/BitKeeper/etc/collapsed
+++ b/BitKeeper/etc/collapsed
@@ -15,3 +15,11 @@
45214442pBGT9KuZEGixBH71jTzbOA
45214a07hVsIGwvwa-WrO-jpeaSwVw
452a92d0-31-8wSzSfZi165fcGcXPA
+454bb488ijVLOUK_GFjcoISE0GxPUA
+454bb9a8AwlGRC_wWLS2sNMoRBMRGw
+454c946ciQoR4dfTBZ0RTBmGJKp6lw
+454f6e7eAnfLD9OCbGr5X9KiKvfKcQ
+454f704bJiJy0_Nx2drY9P5kK3uOzg
+454fa71cxshxszXJQYa9jbo0-_hAHw
+4550b0ceIcozdgQhWFUTAtWkN196lA
+4558b3d73Cxjlb7Wv1oytdSTthxDfw