summaryrefslogtreecommitdiff
path: root/mysql-test/include/commit.inc
diff options
context:
space:
mode:
authorunknown <mkindahl@dl145h.mysql.com>2008-04-01 12:36:20 +0200
committerunknown <mkindahl@dl145h.mysql.com>2008-04-01 12:36:20 +0200
commit4685004d2a519e70498380b8142ff0b8780ea707 (patch)
treeda9a70a4a878c0b88dcc321ecb05e6b5b8d03d6c /mysql-test/include/commit.inc
parenta18647df1bf9e9a7d546358226ed03c652dd4c43 (diff)
parentedcf2742f82d56eddc54011e8e4075dfc4dab54e (diff)
downloadmariadb-git-4685004d2a519e70498380b8142ff0b8780ea707.tar.gz
Merge dl145h.mysql.com:/data0/mkindahl/mysql-5.0-rpl-merge
into dl145h.mysql.com:/data0/mkindahl/mysql-5.1-rpl-merge mysql-test/r/binlog_index.result: Manual merge
Diffstat (limited to 'mysql-test/include/commit.inc')
0 files changed, 0 insertions, 0 deletions