diff options
| author | unknown <cmiller@zippy.cornsilk.net> | 2006-10-09 18:51:02 -0400 |
|---|---|---|
| committer | unknown <cmiller@zippy.cornsilk.net> | 2006-10-09 18:51:02 -0400 |
| commit | 7a71766192edfba99685bcd8acb06f795b2e9083 (patch) | |
| tree | 938d2cdf97f5924099e78141128f7a823185a096 /BitKeeper/etc/collapsed | |
| parent | c9970c5b418742395fb01df17397e50c3e7c3d16 (diff) | |
| parent | 6c91170e3f90b73298d40286cdb84e47d8d31c8a (diff) | |
| download | mariadb-git-7a71766192edfba99685bcd8acb06f795b2e9083.tar.gz | |
Merge zippy.cornsilk.net:/home/cmiller/work/mysql/bug17583/my50-bug17583
into zippy.cornsilk.net:/home/cmiller/work/mysql/bug17583/my51-bug17583
BitKeeper/etc/collapsed:
auto-union
client/mysql.cc:
Auto merged
mysql-test/r/mysql.result:
Auto merged
mysql-test/t/mysql.test:
Auto merged
Diffstat (limited to 'BitKeeper/etc/collapsed')
| -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 79836bb030e..5aee68d5e9d 100644 --- a/BitKeeper/etc/collapsed +++ b/BitKeeper/etc/collapsed @@ -7,3 +7,4 @@ 4513d8e4Af4dQWuk13sArwofRgFDQw 4519a6c5BVUxEHTf5iJnjZkixMBs8g 451ab499rgdjXyOnUDqHu-wBDoS-OQ +452a92d0-31-8wSzSfZi165fcGcXPA |