diff options
author | unknown <msvensson@pilot.(none)> | 2007-05-29 13:02:20 +0200 |
---|---|---|
committer | unknown <msvensson@pilot.(none)> | 2007-05-29 13:02:20 +0200 |
commit | 288a7fc0c9f145f1d27c0b2bd101f61c54c1d4c1 (patch) | |
tree | 3ccc9c41ae8c82fedf5ebc9b379d43e935956f48 /mysql-test/include/master-slave.inc | |
parent | b555053d2192fab6a30d97d775167adb3ebc1302 (diff) | |
parent | 4507f7ed4cd57979e363041206b08963fcb74096 (diff) | |
download | mariadb-git-288a7fc0c9f145f1d27c0b2bd101f61c54c1d4c1.tar.gz |
Merge pilot.(none):/data/msvensson/mysql/mysql-5.0-maint
into pilot.(none):/data/msvensson/mysql/mysql-5.1-new-maint
mysql-test/mysql-test-run.pl:
Auto merged
Diffstat (limited to 'mysql-test/include/master-slave.inc')
0 files changed, 0 insertions, 0 deletions