diff options
| author | unknown <msvensson@neptunus.(none)> | 2006-10-03 14:26:11 +0200 |
|---|---|---|
| committer | unknown <msvensson@neptunus.(none)> | 2006-10-03 14:26:11 +0200 |
| commit | 1535da6592ed6e0ca63a06c46a123a77b30879b3 (patch) | |
| tree | 8d0a6a285975e84bfe85563f390b4f04b857b861 /BitKeeper | |
| parent | 2e2198633e71cfb77dc95f17bfe8f6bb88d63424 (diff) | |
| parent | 7d7487658531c3a191479188c102cb0821bfad9c (diff) | |
| download | mariadb-git-1535da6592ed6e0ca63a06c46a123a77b30879b3.tar.gz | |
Merge bk-internal:/home/bk/mysql-5.0-runtime
into neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint
BitKeeper/etc/collapsed:
auto-union
mysql-test/lib/mtr_process.pl:
Auto merged
mysql-test/mysql-test-run.pl:
Auto merged
mysql-test/r/ps.result:
Auto merged
sql/mysql_priv.h:
Auto merged
sql/opt_range.cc:
Auto merged
sql/sql_acl.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 bbf04965038..79836bb030e 100644 --- a/BitKeeper/etc/collapsed +++ b/BitKeeper/etc/collapsed @@ -5,3 +5,5 @@ 45001f7c3b2hhCXDKfUvzkX9TNe6VA 45002051rHJfMEXAIMiAZV0clxvKSA 4513d8e4Af4dQWuk13sArwofRgFDQw +4519a6c5BVUxEHTf5iJnjZkixMBs8g +451ab499rgdjXyOnUDqHu-wBDoS-OQ |