summaryrefslogtreecommitdiff
path: root/sql/sql_derived.cc
diff options
context:
space:
mode:
authorTor Didriksen <tor.didriksen@oracle.com>2010-12-13 17:13:31 +0100
committerTor Didriksen <tor.didriksen@oracle.com>2010-12-13 17:13:31 +0100
commit8d311a855164416744c35742a3e1368c49ca6c1a (patch)
tree29b2ec94b1ecfb3642452828439a196ccf1a68f3 /sql/sql_derived.cc
parente52e64ac35670a7359b16bff5c0073aa13d3abc3 (diff)
parent0611bf22031283a6b459223eec199f0c0c7ae606 (diff)
downloadmariadb-git-8d311a855164416744c35742a3e1368c49ca6c1a.tar.gz
Automerge 5.1-bugteam => 5.5-bugteam
Diffstat (limited to 'sql/sql_derived.cc')
0 files changed, 0 insertions, 0 deletions