diff options
| author | unknown <mkindahl@dl145h.mysql.com> | 2008-03-12 13:07:35 +0100 |
|---|---|---|
| committer | unknown <mkindahl@dl145h.mysql.com> | 2008-03-12 13:07:35 +0100 |
| commit | 62dee6f7180b777de65159ab9a3159390b28dd27 (patch) | |
| tree | eddab91c19bd0acc227373106b33ed1491913515 /mysql-test/include/commit.inc | |
| parent | 875ad6d8b8f89eed171325a1e8b31816f7edef12 (diff) | |
| parent | 0e679ab782e6968b159bcca8cdf307e5602dd3ea (diff) | |
| download | mariadb-git-62dee6f7180b777de65159ab9a3159390b28dd27.tar.gz | |
Merge dl145h.mysql.com:/data0/mkindahl/mysql-5.0-rpl
into dl145h.mysql.com:/data0/mkindahl/mysql-5.1-rpl
mysql-test/suite/rpl/r/rpl_loaddata.result:
Auto merged
mysql-test/suite/rpl/r/rpl_master_pos_wait.result:
Auto merged
mysql-test/suite/rpl/r/rpl_slave_status.result:
Auto merged
mysql-test/suite/rpl/t/rpl_master_pos_wait.test:
Auto merged
mysql-test/suite/rpl/t/rpl_temporary.test:
Auto merged
mysql-test/suite/rpl/t/rpl_loaddata.test:
Manual merge. The rpl_loaddata.test file was moved on 5.1 by editing
the file to include the file at the new location. This causes conflicts
when merging, since the changes will not propagate to the moved file.
sql/slave.cc:
Manual merge.
mysql-test/suite/rpl/t/rpl_skip_error.test:
Manual merge.
mysql-test/suite/rpl/t/rpl_slave_status.test:
Manual merge.
Diffstat (limited to 'mysql-test/include/commit.inc')
0 files changed, 0 insertions, 0 deletions