diff options
author | unknown <aelkin/elkin@koti.dsl.inet.fi> | 2007-11-06 16:28:09 +0200 |
---|---|---|
committer | unknown <aelkin/elkin@koti.dsl.inet.fi> | 2007-11-06 16:28:09 +0200 |
commit | 74174d6fda1d18fe777358e6fbf335f4bfff970f (patch) | |
tree | 805299919d077aae57d2dc8e1e915d3388787b1f /mysql-test/suite/rpl/r/rpl_stm_reset_slave.result | |
parent | 80533592191e44ba77ba8974576d683b886dd02e (diff) | |
parent | d8c4501b281b436c8a450d86495d7ee0ff58a389 (diff) | |
download | mariadb-git-74174d6fda1d18fe777358e6fbf335f4bfff970f.tar.gz |
Merge koti.dsl.inet.fi:/home/elkin/MySQL/TEAM/BARE/5.0
into koti.dsl.inet.fi:/home/elkin/MySQL/merge-5.1
BitKeeper/deleted/.del-binlog_killed_bug27571-master.opt:
Auto merged
BitKeeper/deleted/.del-binlog_killed_bug27571.test:
Auto merged
Diffstat (limited to 'mysql-test/suite/rpl/r/rpl_stm_reset_slave.result')
0 files changed, 0 insertions, 0 deletions