summaryrefslogtreecommitdiff
path: root/mysql-test/r/merge.result
diff options
context:
space:
mode:
authorunknown <pem@mysql.com>2004-03-17 12:11:04 +0100
committerunknown <pem@mysql.com>2004-03-17 12:11:04 +0100
commitb440d2cf76b126045e3d79679fce1b458016028e (patch)
tree7dba75bc949799583db8937e0ab1a6076dca1891 /mysql-test/r/merge.result
parent6022c31a262881fecc4cd837a41e036489aab8f5 (diff)
parent36dd97239a7b3e84badb7fdc79b221c20cbfe38f (diff)
downloadmariadb-git-b440d2cf76b126045e3d79679fce1b458016028e.tar.gz
Merge mysql.com:/usr/local/bk/mysql-5.0
into mysql.com:/home/pem/work/mysql-5.0-merge
Diffstat (limited to 'mysql-test/r/merge.result')
0 files changed, 0 insertions, 0 deletions