summaryrefslogtreecommitdiff
path: root/sql/slave.cc
diff options
context:
space:
mode:
authorunknown <mkindahl@dl145h.mysql.com>2008-03-04 22:19:23 +0100
committerunknown <mkindahl@dl145h.mysql.com>2008-03-04 22:19:23 +0100
commit5215beee7b01df8796606143d19412cec6bc847b (patch)
tree7390cdc0d5fd3b1c235bcc021e56b1d5babbc983 /sql/slave.cc
parent45eab6d35018d06f3dca39cacee3a99318ea1800 (diff)
parent9ffaa745358b6b72cd6a778f01874a325f198198 (diff)
downloadmariadb-git-5215beee7b01df8796606143d19412cec6bc847b.tar.gz
Merge dl145h.mysql.com:/data0/mkindahl/mysql-5.0-rpl
into dl145h.mysql.com:/data0/mkindahl/mysql-5.1-rpl mysql-test/r/mysqldump.result: Manual merge. mysql-test/t/mysqldump.test: Manual merge.
Diffstat (limited to 'sql/slave.cc')
0 files changed, 0 insertions, 0 deletions