diff options
| author | unknown <cmiller@zippy.cornsilk.net> | 2007-01-26 14:47:35 -0500 |
|---|---|---|
| committer | unknown <cmiller@zippy.cornsilk.net> | 2007-01-26 14:47:35 -0500 |
| commit | 48b8edc2ad6c64b2e131c792312c9eff6d252b95 (patch) | |
| tree | 5fcb06fdfa66050c761b4c31340d1e0016fbcd66 /BitKeeper/etc | |
| parent | 8da25f3abc6bcdd65af87f5383b930b5cb39a04c (diff) | |
| parent | 783b6eb6b62f1e9d62bece3a6a331d005d8999d9 (diff) | |
| download | mariadb-git-48b8edc2ad6c64b2e131c792312c9eff6d252b95.tar.gz | |
Merge zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.0-m,c-gca
into zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.0-maint
BitKeeper/etc/collapsed:
auto-union
sql/mysql_priv.h:
Auto merged
sql/set_var.h:
Auto merged
Diffstat (limited to 'BitKeeper/etc')
| -rw-r--r-- | BitKeeper/etc/collapsed | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/BitKeeper/etc/collapsed b/BitKeeper/etc/collapsed index eb205a2ac2f..2c730ee5808 100644 --- a/BitKeeper/etc/collapsed +++ b/BitKeeper/etc/collapsed @@ -31,3 +31,5 @@ 4558b3d73Cxjlb7Wv1oytdSTthxDfw 45771031yRCoM_ZfONdYchPvVEgLRg 45ae6628gqKTsUFfnoNExadETVIkbA +45ba4faf2oqu6eR8fqecR3LfSNcYUg +45ba5238-NKl80QVXzdGo8hO9M75Xg |