summaryrefslogtreecommitdiff
path: root/mysql-test
diff options
context:
space:
mode:
authorunknown <serg@serg.mysql.com>2001-04-15 20:15:58 +0200
committerunknown <serg@serg.mysql.com>2001-04-15 20:15:58 +0200
commitccc085d00d500eb231228675f27aa8d2c08dd448 (patch)
tree240442b4bbcb545ede618e29dd7eaf34c6e7e31e /mysql-test
parent582174606766c66b7ae474fa0671bec6c162347f (diff)
downloadmariadb-git-ccc085d00d500eb231228675f27aa8d2c08dd448.tar.gz
bad auto-merge fixed
Diffstat (limited to 'mysql-test')
0 files changed, 0 insertions, 0 deletions