diff options
| author | unknown <cmiller@zippy.cornsilk.net> | 2006-12-22 16:02:54 -0500 |
|---|---|---|
| committer | unknown <cmiller@zippy.cornsilk.net> | 2006-12-22 16:02:54 -0500 |
| commit | 01e98327dfe430999c5680fde90ec052be0aec97 (patch) | |
| tree | f8e4ebcfafcd35bbf04666606c2c50a9409ffae0 /BitKeeper | |
| parent | dd6c12516e18802c5a1407f89de7976c186df2cb (diff) | |
| parent | 82bd9b6b61f14b227f0fe9169f0a8754694d1924 (diff) | |
| download | mariadb-git-01e98327dfe430999c5680fde90ec052be0aec97.tar.gz | |
Merge zippy.cornsilk.net:/home/cmiller/work/mysql/bug22555/my50-bug22555
into zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.0-maint
BitKeeper/etc/collapsed:
auto-union
sql/item_sum.cc:
Auto merged
sql/item_sum.h:
Auto merged
mysql-test/r/func_group.result:
Manual merge.
mysql-test/t/func_group.test:
Manual merge.
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 5ff033b2163..951d894c5b6 100644 --- a/BitKeeper/etc/collapsed +++ b/BitKeeper/etc/collapsed @@ -29,3 +29,4 @@ 4554a95d7txO1DuO9G3nAizI3SkFAA 4554b3722d71SbPiI2Gx-RhbZjmuIQ 4558b3d73Cxjlb7Wv1oytdSTthxDfw +45771031yRCoM_ZfONdYchPvVEgLRg |