diff options
| author | unknown <cmiller@zippy.cornsilk.net> | 2006-10-04 12:25:00 -0400 |
|---|---|---|
| committer | unknown <cmiller@zippy.cornsilk.net> | 2006-10-04 12:25:00 -0400 |
| commit | 6670fd8d25b7e795e0e046738c324d315c48ecda (patch) | |
| tree | acfeeff13df6b4a9a284c436846e5e5e8749edab /BitKeeper | |
| parent | f46fafb4b1c9389f232662be076884ecdc6d13cf (diff) | |
| parent | ffefdf5ab93d3280ec429203d4067622549f18af (diff) | |
| download | mariadb-git-6670fd8d25b7e795e0e046738c324d315c48ecda.tar.gz | |
Merge bk-internal.mysql.com:/home/bk/mysql-5.1-maint
into zippy.cornsilk.net:/home/cmiller/work/mysql/bug19356/my51-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 |