summaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
authorGleb Shchepa <gleb.shchepa@oracle.com>2011-04-08 12:09:24 +0400
committerGleb Shchepa <gleb.shchepa@oracle.com>2011-04-08 12:09:24 +0400
commitb2fee393b029e5e2ec7c0a3161d665dad9fa720f (patch)
treea882dbecbe9e5d691e50ad976300ec3274b5c79e /include
parentbbd0d604aac36271bacbf007728d5a1db5151a53 (diff)
parenta77bc59896ee3cd89a8f1d391a65722b443f1841 (diff)
downloadmariadb-git-b2fee393b029e5e2ec7c0a3161d665dad9fa720f.tar.gz
manual merge 5.1-->5.5 (bug 11829681)
Diffstat (limited to 'include')
0 files changed, 0 insertions, 0 deletions