diff options
| author | unknown <cmiller@zippy.cornsilk.net> | 2007-01-17 13:25:05 -0500 |
|---|---|---|
| committer | unknown <cmiller@zippy.cornsilk.net> | 2007-01-17 13:25:05 -0500 |
| commit | 3dcbf5c685781289c718fe42fccfcbc53bd79379 (patch) | |
| tree | 40f8526f6e1a8a52303bf33a2874311ba557fec3 /BitKeeper | |
| parent | ef1940c9ff2ba04ffdfbd3dd7685a38490be5d33 (diff) | |
| parent | 74fa02e80cae99c6d6dc410f97f9a0e463dd1290 (diff) | |
| download | mariadb-git-3dcbf5c685781289c718fe42fccfcbc53bd79379.tar.gz | |
Merge zippy.cornsilk.net:/home/cmiller/work/mysql/bug23721/my50-bug23721
into zippy.cornsilk.net:/home/cmiller/work/mysql/bug23721/my51-bug23721
BitKeeper/etc/collapsed:
auto-union
BUILD/check-cpu:
Auto merged
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 f1dabcfe2ee..96fa1623269 100644 --- a/BitKeeper/etc/collapsed +++ b/BitKeeper/etc/collapsed @@ -33,3 +33,4 @@ 4561bde4qWhz1I8tkItXKex5uniipA 4562ba016dYH0JzszOqZ8p6psbKfnQ 45771031yRCoM_ZfONdYchPvVEgLRg +45ae6628gqKTsUFfnoNExadETVIkbA |