diff options
| author | unknown <tulin@mysql.com> | 2005-02-04 17:32:18 +0100 |
|---|---|---|
| committer | unknown <tulin@mysql.com> | 2005-02-04 17:32:18 +0100 |
| commit | 74ad9e8f1efde5295b9bf0b4bc4a3331d0faab4f (patch) | |
| tree | 673a1a1d3d90ef7b9e00deb8297fd17f65616bef /VC++Files/merge | |
| parent | 5d16b7a93a553b7ec7678d6c0e83a345667895d2 (diff) | |
| parent | 58fd4d94ce16eb473ccf56134bb51e1cd38c9c49 (diff) | |
| download | mariadb-git-74ad9e8f1efde5295b9bf0b4bc4a3331d0faab4f.tar.gz | |
Merge bk-internal:/home/bk/mysql-5.0
into mysql.com:/home/mysqldev/tulin/mysql-5.0
BitKeeper/etc/logging_ok:
auto-union
sql/ha_ndbcluster.cc:
Auto merged
Diffstat (limited to 'VC++Files/merge')
0 files changed, 0 insertions, 0 deletions