summaryrefslogtreecommitdiff
path: root/mysql-test/std_data
diff options
context:
space:
mode:
authorramil@mysql.com <>2006-05-29 11:17:38 +0500
committerramil@mysql.com <>2006-05-29 11:17:38 +0500
commit6b2ab800c998bda6a06a6838f16fc8500b1b7497 (patch)
tree101f685dcf05af4b7a45c2e4c3f23f74da75af96 /mysql-test/std_data
parent120c72b0474e48eb90cd723b7ccf524b79aa2d26 (diff)
downloadmariadb-git-6b2ab800c998bda6a06a6838f16fc8500b1b7497.tar.gz
manual merge
Diffstat (limited to 'mysql-test/std_data')
0 files changed, 0 insertions, 0 deletions