diff options
| author | unknown <msvensson@pilot.(none)> | 2007-06-07 19:59:26 +0200 |
|---|---|---|
| committer | unknown <msvensson@pilot.(none)> | 2007-06-07 19:59:26 +0200 |
| commit | 53c94b71a0103be84cbd6aca0757a163fdbbae83 (patch) | |
| tree | 3a903902d60973497a7eb5a3d239339cc6f06cc9 /mysql-test/include/master-slave.inc | |
| parent | 27c2a89dc62bfcc6dbd3959f0fbbc804f788c357 (diff) | |
| parent | 25ef496835d6751e4bc76ae2937e138d0fcd0bcd (diff) | |
| download | mariadb-git-53c94b71a0103be84cbd6aca0757a163fdbbae83.tar.gz | |
Merge pilot.(none):/data/msvensson/mysql/mysql-5.0-maint
into pilot.(none):/data/msvensson/mysql/mysql-5.1-new-maint
BitKeeper/triggers/pre-commit:
Auto merged
mysql-test/t/mysqldump.test:
Auto merged
mysql-test/extra/binlog_tests/blackhole.test:
Auto merged
Diffstat (limited to 'mysql-test/include/master-slave.inc')
0 files changed, 0 insertions, 0 deletions