summaryrefslogtreecommitdiff
path: root/sql/sql_acl.cc
diff options
context:
space:
mode:
authorMichael Widenius <monty@askmonty.org>2012-02-21 17:48:15 +0200
committerMichael Widenius <monty@askmonty.org>2012-02-21 17:48:15 +0200
commit86eebf33e3383aa5c59fb93473e64a202bc0badb (patch)
tree68d91382a692573160305bf1c4e15114af24d96a /sql/sql_acl.cc
parent3608ec3036fba4921c11e3d2caa3584c41975187 (diff)
parent70e6f0d854cb7a47bd24e09f1a1723f106afd53f (diff)
downloadmariadb-git-86eebf33e3383aa5c59fb93473e64a202bc0badb.tar.gz
Automatic merge with 5.1
Diffstat (limited to 'sql/sql_acl.cc')
0 files changed, 0 insertions, 0 deletions