diff options
| author | unknown <cmiller@zippy.cornsilk.net> | 2007-01-31 16:14:12 -0500 |
|---|---|---|
| committer | unknown <cmiller@zippy.cornsilk.net> | 2007-01-31 16:14:12 -0500 |
| commit | 3d6e5feaf956d86751f3a1774fafd3bbaea3b1bc (patch) | |
| tree | 92a8480acf020e5cf0ff0099b9e3bcab8f68302c /BitKeeper | |
| parent | bca07eea64cf96db764aaafc3350560a656a467b (diff) | |
| parent | f50bf8728113cbb56dc231fd076bfdf624544913 (diff) | |
| download | mariadb-git-3d6e5feaf956d86751f3a1774fafd3bbaea3b1bc.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
BitKeeper/etc/collapsed:
auto-union
Diffstat (limited to 'BitKeeper')
| -rw-r--r-- | BitKeeper/etc/collapsed | 6 |
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 |