diff options
| author | unknown <cmiller@zippy.cornsilk.net> | 2006-10-09 18:54:48 -0400 |
|---|---|---|
| committer | unknown <cmiller@zippy.cornsilk.net> | 2006-10-09 18:54:48 -0400 |
| commit | 87ae7cb978dfeb249cdc6c5000d788949d82a665 (patch) | |
| tree | 2a22d5b12f6a6d0fca3e04c62b0ccb18090bd026 /BitKeeper | |
| parent | 28b3dba139383d09f3d9b066b89611d17275e2e4 (diff) | |
| parent | 6c91170e3f90b73298d40286cdb84e47d8d31c8a (diff) | |
| download | mariadb-git-87ae7cb978dfeb249cdc6c5000d788949d82a665.tar.gz | |
Merge bk-internal.mysql.com:/home/bk/mysql-5.0-maint
into zippy.cornsilk.net:/home/cmiller/work/mysql/bug17583/my50-bug17583
BitKeeper/etc/collapsed:
auto-union
client/mysql.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 1d220fdb31d..e6d64f4f6ee 100644 --- a/BitKeeper/etc/collapsed +++ b/BitKeeper/etc/collapsed @@ -9,3 +9,4 @@ 451ab499rgdjXyOnUDqHu-wBDoS-OQ 45214442pBGT9KuZEGixBH71jTzbOA 45214a07hVsIGwvwa-WrO-jpeaSwVw +452a92d0-31-8wSzSfZi165fcGcXPA |