summaryrefslogtreecommitdiff
path: root/sql/sql_union.cc
Commit message (Expand)AuthorAgeFilesLines
* merge.Sergei Golubchik2010-11-251-7/+30
|\
| * Merge 5.2->5.3Sergey Petrunya2010-10-101-20/+18
| |\
| | * Merge with MySQL 5.1.49Michael Widenius2010-08-021-20/+18
| | |\
| * | | Fixed a problem where the temp table of a materialized subqueryunknown2010-07-161-0/+16
| * | | Subquery cache (MWL#66) added.unknown2010-07-101-1/+1
| * | | Merge MariaDB-5.2 -> MariaDB 5.3Sergey Petrunya2010-03-201-1/+30
| |\ \ \ | | |/ /
| | * | Merge MySQL 5.1.44 into MariaDB.unknown2010-03-041-1/+30
| | |\ \
| * | | | Subquery optimizations backport: fix test failures, update test results.Sergey Petrunya2010-02-181-2/+6
| * | | | Subquery optimizations: non-semijoin materializationSergey Petrunya2010-01-281-2/+2
| * | | | Backport of subquery optimizations to 5.3.Sergey Petrunya2010-01-171-1/+4
| |/ / /
| * | | Merge MySQL->MariaDBSergey Petrunya2009-09-081-2/+14
| |\ \ \
| * \ \ \ Merge with base MySQL 5.1Michael Widenius2009-02-151-1/+1
| |\ \ \ \
| * \ \ \ \ Merge of 5.1-main into 5.1-maria. There were no changes to storage/myisam, or...Guilhem Bichot2008-11-211-1/+0
| |\ \ \ \ \
| * \ \ \ \ \ Merge janus.mylan:/usr/home/serg/Abk/mysql-5.1unknown2008-02-051-3/+3
| |\ \ \ \ \ \
| * \ \ \ \ \ \ Merge jani@marvel:/my/bk/mysql-maria.newunknown2007-12-181-2/+2
| |\ \ \ \ \ \ \
| | * | | | | | | Fixed bug in undo_key_delete; Caused crashed key files in recoveryunknown2007-12-171-2/+2
* | | | | | | | | 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 26243unknown2008-03-291-0/+2
* | | | A pre-requisite for the fix for Bug#12713 "Error in a stored function unknown2007-12-201-3/+3
| |/ / |/| |
* | | Use an inline getter method (thd->is_error()) to query if there is an error unknown2007-10-301-1/+1
| |/ |/|
* | Merge 50 -> 51 (-opt changesets)unknown2007-08-011-17/+40
|\ \ | |/
| * Post-merge fixesunknown2007-07-311-2/+2
| * BUG#29582: huge memory consumption with union, subselect, joins:unknown2007-07-311-17/+40
* | Merge jamppa@bk-internal.mysql.com:/home/bk/mysql-5.1unknown2007-05-241-3/+3
|\ \
| * | WL#3817: Simplify string / memory area types and make things more consistent ...unknown2007-05-101-3/+3
* | | Merge mysql.com:/d2/hf/mrg/mysql-5.0-optunknown2007-05-181-1/+9
|\ \ \ | |/ / |/| / | |/
| * Merge olga.mysql.com:/home/igor/dev-opt/mysql-4.1-opt-bug27937unknown2007-05-141-1/+9
| |\
| | * Fixed bug #27937: crash for the the second execution of a preparedunknown2007-05-141-0/+5
* | | - addendum of the fix for bug 27786:unknown2007-04-231-10/+9
* | | Merge moonbone.local:/mnt/gentoo64/work/27321-bug-5.0-opt-mysqlunknown2007-04-151-0/+1
|\ \ \ | |/ /
| * | Bug#27321: Wrong subquery result in a grouping select.unknown2007-04-151-0/+1
* | | Merge epotemkin@bk-internal.mysql.com:/home/bk/mysql-5.0-optunknown2007-03-111-0/+6
|\ \ \ | |/ /
| * | Bug#22331: Wrong WHERE in EXPLAIN EXTENDED when all expressions were optimizedunknown2007-03-101-0/+6
| * | Merge mysql.com:/home/gluh/MySQL/Merge/5.0unknown2007-02-261-0/+2
| |\ \
| * \ \ Merge bk-internal.mysql.com:/home/bk/mysql-5.0unknown2007-02-211-44/+45
| |\ \ \
* | \ \ \ Merge mysql.com:/home/gluh/MySQL/Merge/5.0-optunknown2007-02-261-0/+2
|\ \ \ \ \ | | |_|/ / | |/| | |
| * | | | Bug #25831: Deficiencies in INSERT ... SELECT ... field name resolving.unknown2007-02-191-0/+2
| |/ / /
* | | | Merge bk-internal.mysql.com:/home/bk/mysql-5.1unknown2007-01-291-44/+45
|\ \ \ \
| * \ \ \ Merge mysql.com:/home/my/mysql-5.0unknown2007-01-271-44/+45
| |\ \ \ \ | | | |/ / | | |/| |