summaryrefslogtreecommitdiff
path: root/BitKeeper
diff options
context:
space:
mode:
authorcmiller@zippy.cornsilk.net <>2007-01-31 16:14:42 -0500
committercmiller@zippy.cornsilk.net <>2007-01-31 16:14:42 -0500
commitb81f4a8314932c46da64c9d6c5b46b17685bbf28 (patch)
tree832f8cdf50777d5c22939fa92a5c7ad1bfdc91f3 /BitKeeper
parent13b35c4323c6433bfa30ffe26c05bb7290626c40 (diff)
parenta3a9d8bd846682f31a9667a37adfd9ff93b13535 (diff)
downloadmariadb-git-b81f4a8314932c46da64c9d6c5b46b17685bbf28.tar.gz
Merge zippy.cornsilk.net:/home/cmiller/work/mysql/bug25341/my51-bug25341
into zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.1-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 d16baafda14..5c9de1cf2d9 100644
--- a/BitKeeper/etc/collapsed
+++ b/BitKeeper/etc/collapsed
@@ -33,6 +33,12 @@
4561bde4qWhz1I8tkItXKex5uniipA
4562ba016dYH0JzszOqZ8p6psbKfnQ
45771031yRCoM_ZfONdYchPvVEgLRg
+459a60d8rIxeTuhB3j_QsOwLGdcpng
+459a61c9OS8PzIsdviZJDkybJ1y1uA
+459a70691aYIfU2ohV0a3P5iTLpO2A
+459a7422KF_P7PuU3YQ5qG6ZLEVpiA
+459a74e4nRcXppMSBYeQQ5efDkTADg
45ae6628gqKTsUFfnoNExadETVIkbA
45ba4faf2oqu6eR8fqecR3LfSNcYUg
45ba5238-NKl80QVXzdGo8hO9M75Xg
+45c0fdfb2mz6NdOIsLenJtf6_ZelTA