summaryrefslogtreecommitdiff
path: root/sql/sql_union.cc
diff options
context:
space:
mode:
authorunknown <knielsen@knielsen-hq.org>2012-02-14 16:06:41 +0100
committerunknown <knielsen@knielsen-hq.org>2012-02-14 16:06:41 +0100
commit47a54a2e087a7c1fc861bcbc114c14987f492cfe (patch)
tree6fd2aa26626f3f8e7ae49333ca3fbb546a992972 /sql/sql_union.cc
parentbbd20403c5f759fa3ce866703a5fba0d193a1734 (diff)
parent16036b5e61d8f48f352ac4e1f68a541f45f2ae34 (diff)
downloadmariadb-git-47a54a2e087a7c1fc861bcbc114c14987f492cfe.tar.gz
Merge MySQL 5.5.20 into MariaDB 5.5.
Diffstat (limited to 'sql/sql_union.cc')
0 files changed, 0 insertions, 0 deletions