diff options
| author | unknown <bar@mysql.com/bar.intranet.mysql.r18.ru> | 2006-10-30 10:16:18 +0400 |
|---|---|---|
| committer | unknown <bar@mysql.com/bar.intranet.mysql.r18.ru> | 2006-10-30 10:16:18 +0400 |
| commit | 4453dc48e461aa1df8c68b1e11ccf3d7c4e29584 (patch) | |
| tree | 0cf4b1878152d8174923217f3ebe7c59ccab64c8 /BitKeeper | |
| parent | 99530d8aee996002c0dca511a2d04901e26f212b (diff) | |
| parent | 00c1c19e9410a942ed7b2b49e7dc7916a9d8010f (diff) | |
| download | mariadb-git-4453dc48e461aa1df8c68b1e11ccf3d7c4e29584.tar.gz | |
Merge abarkov@bk-internal.mysql.com:/home/bk/mysql-5.0-rpl
into mysql.com:/usr/home/bar/mysql-5.0.b18908
BitKeeper/etc/collapsed:
auto-union
mysql-test/r/ctype_utf8.result:
Auto merged
sql/field.cc:
Auto merged
sql/sql_string.cc:
Auto merged
Diffstat (limited to 'BitKeeper')
| -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 |