diff options
| author | unknown <lars/lthalmann@mysql.com/dl145h.mysql.com> | 2006-11-07 12:02:53 +0100 |
|---|---|---|
| committer | unknown <lars/lthalmann@mysql.com/dl145h.mysql.com> | 2006-11-07 12:02:53 +0100 |
| commit | c6de4d1c3baa5a27dd6f4ba2dd58c85e627b6536 (patch) | |
| tree | 214efbfcc03cc6ef5dd9efc1421eda2a2bdd3e4f /BitKeeper | |
| parent | 024a1781a6310383c1e352d483e7a701d564d051 (diff) | |
| parent | fff7e9199d9f0c150d35b54c3b81dfc9ec0b75c0 (diff) | |
| download | mariadb-git-c6de4d1c3baa5a27dd6f4ba2dd58c85e627b6536.tar.gz | |
Merge mysql.com:/users/lthalmann/bkroot/mysql-5.0-rpl
into mysql.com:/users/lthalmann/bk/MERGE/mysql-5.0-merge
BitKeeper/etc/collapsed:
auto-union
mysql-test/r/ctype_utf8.result:
Auto merged
sql/field.cc:
Auto merged
sql/sql_parse.cc:
Auto merged
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 311c3813abf..1a7ce408cf3 100644 --- a/BitKeeper/etc/collapsed +++ b/BitKeeper/etc/collapsed @@ -15,3 +15,5 @@ 45214442pBGT9KuZEGixBH71jTzbOA 45214a07hVsIGwvwa-WrO-jpeaSwVw 452a92d0-31-8wSzSfZi165fcGcXPA +452c6c6dAjuNghfc1ObZ_UQ5SCl85g +4538a7b0EbDHHkWPbIwxO6ZIDdg6Dg |