summaryrefslogtreecommitdiff
path: root/mysql-test/r/merge.result
diff options
context:
space:
mode:
authorunknown <ibabaev@bk-internal.mysql.com>2007-02-13 21:25:22 +0100
committerunknown <ibabaev@bk-internal.mysql.com>2007-02-13 21:25:22 +0100
commitaf1f49b77eed1039e3116d91b70f102894db941b (patch)
treec496b56845514ac58e3a497ad0699a7d4d1a1593 /mysql-test/r/merge.result
parent38fa86a12e9e6967a08bf94af06709b3b3fc055a (diff)
parent82e677b9479e1152028c242ade16a0a374c6abc7 (diff)
downloadmariadb-git-af1f49b77eed1039e3116d91b70f102894db941b.tar.gz
Merge bk-internal.mysql.com:/data0/bk/mysql-4.1
into bk-internal.mysql.com:/data0/bk/mysql-4.1-opt
Diffstat (limited to 'mysql-test/r/merge.result')
0 files changed, 0 insertions, 0 deletions