diff options
author | bar@bar.intranet.mysql.r18.ru <> | 2006-11-01 16:48:03 +0400 |
---|---|---|
committer | bar@bar.intranet.mysql.r18.ru <> | 2006-11-01 16:48:03 +0400 |
commit | cefa1cf9e03c1afed92ac61152b3eac2479167bd (patch) | |
tree | 05bd541c3b5ac58466925f5a05817fec19097049 /BitKeeper/etc | |
parent | c9b963cfcdb4f9200f279c008e6b3056290cd38d (diff) | |
parent | 0e3a1eece7289c56bb653f25523d4518ba694452 (diff) | |
download | mariadb-git-cefa1cf9e03c1afed92ac61152b3eac2479167bd.tar.gz |
Merge mysql.com:/usr/home/bar/mysql-5.0.b18908
into mysql.com:/usr/home/bar/mysql-5.1-rpl
Diffstat (limited to 'BitKeeper/etc')
-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..224b77be41b 100644 --- a/BitKeeper/etc/collapsed +++ b/BitKeeper/etc/collapsed @@ -7,3 +7,4 @@ 4513d8e4Af4dQWuk13sArwofRgFDQw 4519a6c5BVUxEHTf5iJnjZkixMBs8g 451ab499rgdjXyOnUDqHu-wBDoS-OQ +452c6c6dAjuNghfc1ObZ_UQ5SCl85g |