summaryrefslogtreecommitdiff
path: root/mysql-test/r/merge.result
diff options
context:
space:
mode:
authorGeorgi Kodinov <joro@sun.com>2009-02-06 15:39:29 +0200
committerGeorgi Kodinov <joro@sun.com>2009-02-06 15:39:29 +0200
commit7fe7d9b2d29a55cea368f396fc7b358e8fc5dd77 (patch)
tree92b8561eb89163fa6241a6e6d16257b20e8d3463 /mysql-test/r/merge.result
parent0a6c553510640be7df2d6c40a858061fa9cc8ed3 (diff)
parent78d80a882a3b7bed9feefaa5b19e9a3c933e3f6d (diff)
downloadmariadb-git-7fe7d9b2d29a55cea368f396fc7b358e8fc5dd77.tar.gz
merged 5.0-main -> 5.0-bugteam
Diffstat (limited to 'mysql-test/r/merge.result')
0 files changed, 0 insertions, 0 deletions