summaryrefslogtreecommitdiff
path: root/mysql-test/r/grant.result
diff options
context:
space:
mode:
authorJon Olav Hauglid <jon.hauglid@oracle.com>2010-10-07 15:33:18 +0200
committerJon Olav Hauglid <jon.hauglid@oracle.com>2010-10-07 15:33:18 +0200
commit4bc7ff6993128b1389410b5dff5b65723515c1ac (patch)
tree21ff904f301455dec07c933e0f5e4958244614e2 /mysql-test/r/grant.result
parent60d558d89d35664faf48ddc3eb4c95d0c39014f7 (diff)
parente486d21dfc0f731a8e109c211845f6172175c612 (diff)
downloadmariadb-git-4bc7ff6993128b1389410b5dff5b65723515c1ac.tar.gz
Merge from mysql-5.5-bugteam to mysql-5.5-runtime
No conflicts
Diffstat (limited to 'mysql-test/r/grant.result')
0 files changed, 0 insertions, 0 deletions