summaryrefslogtreecommitdiff
path: root/include/mysql.h.pp
diff options
context:
space:
mode:
authorMichael Widenius <monty@askmonty.org>2011-08-16 15:51:40 +0300
committerMichael Widenius <monty@askmonty.org>2011-08-16 15:51:40 +0300
commit2dfd946fd4eaba1632eb9a98bb047a4fe3afbedd (patch)
tree9e2129be0d36d6d157a26e783f07de8eb7b52bd2 /include/mysql.h.pp
parentfb135f7ee570a199d78db7c3222db1980b75060f (diff)
parentcea27d300236436cfc0a0fca6c0993c3867be8f6 (diff)
downloadmariadb-git-2dfd946fd4eaba1632eb9a98bb047a4fe3afbedd.tar.gz
Automatic merge with 5.2
Diffstat (limited to 'include/mysql.h.pp')
0 files changed, 0 insertions, 0 deletions