summaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
authorMichael Widenius <monty@askmonty.org>2011-05-28 05:17:24 +0300
committerMichael Widenius <monty@askmonty.org>2011-05-28 05:17:24 +0300
commitbf33056ef975c1aaed5d953e086db78c37221c78 (patch)
treef58b906093fbb5fde2bd49b81b0b98231bf20159 /include
parentf197991f4102ed8ac66b7b57071f24f1d3b86aea (diff)
parent00752ba43c9034fd77e03a65f2a6be9ea15032d2 (diff)
downloadmariadb-git-bf33056ef975c1aaed5d953e086db78c37221c78.tar.gz
automatic merge with 5.2
Diffstat (limited to 'include')
0 files changed, 0 insertions, 0 deletions