summaryrefslogtreecommitdiff
path: root/sql/sql_union.cc
Commit message (Expand)AuthorAgeFilesLines
* merge 5.1-security => 5.5-securityTor Didriksen2011-07-111-8/+30
|\
| * Bug#11765255 - 58201: VALGRIND/CRASH WHEN ORDERING BY MULTIPLE AGGREGATE FUNC...Tor Didriksen2011-07-111-9/+30
* | Updated/added copyright headersKent Boortz2011-06-301-2/+2
|\ \ | |/
| * Updated/added copyright headersKent Boortz2011-06-301-2/+4
| |\
| | * Updated/added copyright headersKent Boortz2011-06-301-2/+3
* | | Bug#57704 Cleanup code dies with void TABLE::set_keyread(bool): Assertion `fi...Oystein Grovlen2010-11-101-0/+1
* | | Merge of mysql-5.1-bugteam into mysql-5.5-bugteam.Davi Arnaut2010-10-201-9/+0
|\ \ \ | |/ /
| * | Bug#45288: pb2 returns a lot of compilation warningsDavi Arnaut2010-10-201-9/+0
* | | Implement WL#5502 Remove dead 5.0 class Sensitive_cursor.Konstantin Osipov2010-07-271-2/+1
* | | Merge of mysql-5.1-bugteam into mysql-trunk-merge.Davi Arnaut2010-06-101-20/+18
|\ \ \ | |/ /
| * | Bug#42733: Type-punning warnings when compiling MySQL --Davi Arnaut2010-06-101-20/+18
* | | WL#5030: Split and remove mysql_priv.hMats Kindahl2010-03-311-1/+5
* | | Manual merge from mysql-trunk-merge.Alexander Nozdrin2010-01-191-1/+30
|\ \ \ | |/ /
| * | Bug #49734: Crash on EXPLAIN EXTENDED UNION ... ORDER BY <any non-const-funct...Georgi Kodinov2009-12-221-1/+30
* | | WL#4738 streamline/simplify @@variable creation processSergei Golubchik2009-12-221-4/+4
|/ /
* | 5.0-bugteam->5.1-bugteam mergeSergey Glukhov2009-05-151-2/+14
|\ \ | |/
| * Bug#43612 crash with explain extended, union, order bySergey Glukhov2009-05-151-2/+14
* | Added "Sun Microsystems, Inc." to copyright headers on files modifiedBuild Team2008-11-101-1/+1
* | manual merge 5.0-5.1.29-rc --> 5.1-5.1.29-rcGleb Shchepa2008-10-091-1/+0
|\ \ | |/
| * Bug#38499: flush tables and multitable table update withGleb Shchepa2008-10-091-1/+0
| * fixes for warnings and compile errors for the fix of bug 26243gkodinov/kgeorge@macbook.gmz2008-03-291-0/+2
* | A pre-requisite for the fix for Bug#12713 "Error in a stored function kostja@bodhi.(none)2007-12-201-3/+3
* | Use an inline getter method (thd->is_error()) to query if there is an error kostja@bodhi.(none)2007-10-301-1/+1
* | Merge 50 -> 51 (-opt changesets)tsmith@ramayana.hindu.god2007-08-011-17/+40
|\ \ | |/
| * Post-merge fixessergefp@mysql.com2007-07-311-2/+2
| * BUG#29582: huge memory consumption with union, subselect, joins:sergefp@mysql.com2007-07-311-17/+40
* | Merge jamppa@bk-internal.mysql.com:/home/bk/mysql-5.1jani@a88-113-38-195.elisa-laajakaista.fi2007-05-241-3/+3
|\ \
| * | WL#3817: Simplify string / memory area types and make things more consistent ...monty@mysql.com/narttu.mysql.fi2007-05-101-3/+3
* | | Merge mysql.com:/d2/hf/mrg/mysql-5.0-optholyfoot/hf@hfmain.(none)2007-05-181-1/+9
|\ \ \ | |/ / |/| / | |/
| * Merge olga.mysql.com:/home/igor/dev-opt/mysql-4.1-opt-bug27937igor@olga.mysql.com2007-05-141-1/+9
| |\
| | * Fixed bug #27937: crash for the the second execution of a preparedigor@olga.mysql.com2007-05-141-0/+5
* | | - addendum of the fix for bug 27786:gkodinov/kgeorge@magare.gmz2007-04-231-10/+9
* | | Merge moonbone.local:/mnt/gentoo64/work/27321-bug-5.0-opt-mysqlevgen@moonbone.local2007-04-151-0/+1
|\ \ \ | |/ /
| * | Bug#27321: Wrong subquery result in a grouping select.evgen@moonbone.local2007-04-151-0/+1
* | | Merge epotemkin@bk-internal.mysql.com:/home/bk/mysql-5.0-optevgen@moonbone.local2007-03-111-0/+6
|\ \ \ | |/ /
| * | Bug#22331: Wrong WHERE in EXPLAIN EXTENDED when all expressions were optimizedevgen@moonbone.local2007-03-101-0/+6
| * | Merge mysql.com:/home/gluh/MySQL/Merge/5.0gluh@mysql.com/eagle.(none)2007-02-261-0/+2
| |\ \
| * \ \ Merge bk-internal.mysql.com:/home/bk/mysql-5.0monty@mysql.com/narttu.mysql.fi2007-02-211-44/+45
| |\ \ \
* | \ \ \ Merge mysql.com:/home/gluh/MySQL/Merge/5.0-optgluh@eagle.(none)2007-02-261-0/+2
|\ \ \ \ \ | | |_|/ / | |/| | |
| * | | | Bug #25831: Deficiencies in INSERT ... SELECT ... field name resolving.gkodinov/kgeorge@macbook.gmz2007-02-191-0/+2
| |/ / /
* | | | Merge bk-internal.mysql.com:/home/bk/mysql-5.1monty@narttu.mysql.fi2007-01-291-44/+45
|\ \ \ \
| * \ \ \ Merge mysql.com:/home/my/mysql-5.0monty@narttu.mysql.fi2007-01-271-44/+45
| |\ \ \ \ | | | |/ / | | |/| |
| | * | | Merge bk-internal.mysql.com:/home/bk/mysql-5.0monty@mysql.com/narttu.mysql.fi2007-01-221-44/+45
| | |\ \ \
| | | * | | Fixed compiler warnings detected by option -Wshadow and -Wunused:monty@mysql.com/narttu.mysql.fi2006-12-151-44/+45
* | | | | | Merge macbook.gmz:/Users/kgeorge/mysql/work/mysql-5.0-optgkodinov/kgeorge@macbook.gmz2007-01-231-0/+1
|\ \ \ \ \ \ | |/ / / / / |/| | | / / | | |_|/ / | |/| | |
| * | | | Bug#23417: Too strict checks against GROUP BY in the ONLY_FULL_GROUP_BY mode.evgen@moonbone.local2007-01-111-0/+1
| |/ / /
* | | | Merge mysql.com:/home/kent/bk/main/mysql-5.0kent@kent-amd64.(none)2006-12-231-2/+1
|\ \ \ \ | |/ / /
| * | | Many files:kent@mysql.com/kent-amd64.(none)2006-12-231-2/+1
| |/ /
| * | Merge bk-internal.mysql.com:/home/bk/mysql-5.0cmiller@zippy.cornsilk.net2006-11-021-2/+13
| |\ \
* | | | Fixed compiler warnings (Mostly VC++):monty@mysql.com/narttu.mysql.fi2006-11-301-0/+2
View Lorry Controller Status