diff options
author | cmiller@zippy.cornsilk.net <> | 2006-12-22 15:59:10 -0500 |
---|---|---|
committer | cmiller@zippy.cornsilk.net <> | 2006-12-22 15:59:10 -0500 |
commit | 83355bfb8104215fe6d0f699e55977f4a1760545 (patch) | |
tree | 660058307773737acf114594612f03b8754edb03 /BitKeeper | |
parent | 7d07c33d3055392e626d9d12ff947a092f2b460c (diff) | |
parent | 50726b2322edac8e93489fcb5ef75a5634222d44 (diff) | |
download | mariadb-git-83355bfb8104215fe6d0f699e55977f4a1760545.tar.gz |
Merge zippy.cornsilk.net:/home/cmiller/work/mysql/bug22555/my50-bug22555
into zippy.cornsilk.net:/home/cmiller/work/mysql/bug22555/my51-bug22555
Diffstat (limited to 'BitKeeper')
-rw-r--r-- | BitKeeper/etc/collapsed | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/BitKeeper/etc/collapsed b/BitKeeper/etc/collapsed index ddaafba882c..837a8997495 100644 --- a/BitKeeper/etc/collapsed +++ b/BitKeeper/etc/collapsed @@ -19,3 +19,4 @@ 454f8960jsVT_kMKJtZ9OCgXoba0xQ 4554a95d7txO1DuO9G3nAizI3SkFAA 4554b3722d71SbPiI2Gx-RhbZjmuIQ +45771031yRCoM_ZfONdYchPvVEgLRg |