diff options
| author | unknown <cmiller@zippy.cornsilk.net> | 2006-10-04 12:32:42 -0400 |
|---|---|---|
| committer | unknown <cmiller@zippy.cornsilk.net> | 2006-10-04 12:32:42 -0400 |
| commit | 5177ee9c1755bf089c955d50475b875566b70c83 (patch) | |
| tree | e17b57af245067702e64a0d5ddf501f496715412 /BitKeeper | |
| parent | 353ab62865377486eb31a4bd22823f15a276bce3 (diff) | |
| parent | 115121b1be9f0847578550d08ebb7d177d188bd7 (diff) | |
| download | mariadb-git-5177ee9c1755bf089c955d50475b875566b70c83.tar.gz | |
Merge bk-internal.mysql.com:/home/bk/mysql-5.0-maint
into zippy.cornsilk.net:/home/cmiller/work/mysql/bug19356/my50-bug19356
BitKeeper/etc/collapsed:
auto-union
Diffstat (limited to 'BitKeeper')
| -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 79836bb030e..1d220fdb31d 100644 --- a/BitKeeper/etc/collapsed +++ b/BitKeeper/etc/collapsed @@ -7,3 +7,5 @@ 4513d8e4Af4dQWuk13sArwofRgFDQw 4519a6c5BVUxEHTf5iJnjZkixMBs8g 451ab499rgdjXyOnUDqHu-wBDoS-OQ +45214442pBGT9KuZEGixBH71jTzbOA +45214a07hVsIGwvwa-WrO-jpeaSwVw |