summaryrefslogtreecommitdiff
path: root/sql/sql_union.cc
diff options
context:
space:
mode:
authorGeorgi Kodinov <Georgi.Kodinov@Oracle.com>2011-06-16 13:54:16 +0300
committerGeorgi Kodinov <Georgi.Kodinov@Oracle.com>2011-06-16 13:54:16 +0300
commit0a07be0b2afce18853980a336362db514fd6d9e1 (patch)
tree890fcb9468d7e6fbaf14fd2b48ed78d80d2673b6 /sql/sql_union.cc
parent5cfac860bc52e2c0f3953f23564bcf613618ea0b (diff)
parentf3b5aa7ad65d548177b158c23e7772033461e964 (diff)
downloadmariadb-git-0a07be0b2afce18853980a336362db514fd6d9e1.tar.gz
merge 5.1-security->5.5-security
Diffstat (limited to 'sql/sql_union.cc')
0 files changed, 0 insertions, 0 deletions