summaryrefslogtreecommitdiff
path: root/sql/sql_union.cc
diff options
context:
space:
mode:
authorSergey Petrunya <psergey@askmonty.org>2009-09-15 14:46:35 +0400
committerSergey Petrunya <psergey@askmonty.org>2009-09-15 14:46:35 +0400
commiteab1dd4d079901c393e5e5e6a537c669c225fc79 (patch)
tree1972ed60ad937e632cf111e7beafb2148a87efeb /sql/sql_union.cc
parent77f8a772d7c469e6a0d22f928d743be63ee6836d (diff)
parent48831c7bb0d74cb515426bd63b9093c81d892d84 (diff)
downloadmariadb-git-eab1dd4d079901c393e5e5e6a537c669c225fc79.tar.gz
Merge lp:maria -> lp:~maria-captains/maria/maria-5.1-merge
Diffstat (limited to 'sql/sql_union.cc')
0 files changed, 0 insertions, 0 deletions