summaryrefslogtreecommitdiff
path: root/sql/sql_union.cc
Commit message (Expand)AuthorAgeFilesLines
* fixes for test failuresSergei Golubchik2012-09-271-3/+3
* Merged the implementation of MDEV-28 LIMIT ROWS EXAMINED into MariaDB 5.5.unknown2012-03-121-1/+24
|\
| * Implementation of MDEV-28 LIMIT ROWS EXAMINEDunknown2012-03-111-1/+24
* | Merge 5.3->5.5.Igor Babaev2012-03-011-0/+8
|\ \ | |/
| * Fixed LP bug #939009.Igor Babaev2012-02-241-0/+8
* | 5.3.4 mergeSergei Golubchik2012-02-151-0/+1
|\ \ | |/
| * Fix for LP BUG#910123 MariaDB 5.3.3 causes 1093 error on Drupalunknown2012-02-141-0/+1
* | 5.3 mergeSergei Golubchik2012-01-131-1/+1
|\ \ | |/
| * Merge with 5.2.Michael Widenius2011-12-111-9/+32
| |\
| | * Merge with MySQL 5.1.60Michael Widenius2011-11-231-9/+30
| | |\
| | * \ Initail merge with MySQL 5.1 (XtraDB still needs to be merged)Michael Widenius2011-11-211-2/+4
| | |\ \
* | | \ \ 5.3->5.5 mergeSergei Golubchik2011-11-221-0/+1
|\ \ \ \ \ | |/ / / /
| * | | | Fixed issue with slow query logging where examined rows where wrongMichael Widenius2011-09-231-0/+1
* | | | | mysql-5.5.18 mergeSergei Golubchik2011-11-031-9/+31
|\ \ \ \ \
| * \ \ \ \ 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
* | | | | | merge with 5.3Sergei Golubchik2011-10-191-21/+154
|\ \ \ \ \ \ | | |_|_|/ / | |/| | | |
| * | | | | Fixed LP bug #825035.Igor Babaev2011-08-161-0/+3
| * | | | | New status variables: Rows_tmp_read, Handler_tmp_update and Handler_tmp_writeMichael Widenius2011-06-271-1/+1
| * | | | | Merged the code of mwl 106 into the latest 5.3 with mwl 90 pushed.Igor Babaev2011-06-041-15/+118
| |\ \ \ \ \
| | * | | | | Fixed typo (exlude -> exclude).unknown2011-05-301-2/+2
| | * | | | | Applied Sanja's patch to fix LP bug #784297 in the tree for mwl106.Igor Babaev2011-05-271-0/+24
| | * | | | | MergeIgor Babaev2011-05-201-14/+93
| | |\ \ \ \ \
| | | * | | | | Fixed compiler warnings.Igor Babaev2011-05-191-2/+2
| | | * | | | | Merged the code of MWL#106 into 5.3Igor Babaev2011-05-161-14/+93
| | | |\ \ \ \ \
| | | | * \ \ \ \ Merge of the mwl106 tree into the latest 5.3 tree.Igor Babaev2010-09-231-14/+93
| | | | |\ \ \ \ \
| | | | | * | | | | MWL#106: Backport optimizations for derived tables and views.Igor Babaev2010-05-261-14/+93
| * | | | | | | | | Merge 5.3->main -> 5.3-mwl90Sergey Petrunya2011-05-291-1/+7
| |\ \ \ \ \ \ \ \ \ | | |/ / / / / / / / | |/| | | | | | | |
| | * | | | | | | | Merge MWL#90 with 5.3-mainSergey Petrunya2011-05-251-1/+7
| | |\ \ \ \ \ \ \ \ | | | |/ / / / / / / | | |/| | | | | | |
| | | * | | | | | | Rename JOIN::top_jtrange_tables to top_join_tab_countSergey Petrunya2011-03-271-1/+1
| | | * | | | | | | MWL#90: Address review feedback part #14Sergey Petrunya2011-03-271-1/+1
| | | * | | | | | | MWL#90: Subqueries: Inside-out execution for materialized non-sj subqueriesSergey Petrunya2010-12-091-0/+1
| | | |\ \ \ \ \ \ \
| | | | * | | | | | | MWL#90, code movearound to unify merged and non-merged semi-join materializat...Sergey Petrunya2010-06-041-0/+1
| | | | * | | | | | | Fixed a problem where the temp table of a materialized subqueryunknown2010-04-061-0/+16
| | | | | |/ / / / / | | | | |/| | | | |
| * | | | | | | | | Merge with 5.3 mainMichael Widenius2011-05-161-0/+14
| |\ \ \ \ \ \ \ \ \ | | |/ / / / / / / /
| | * | | | | | | | Merge MWL#89 into 5.3 main.unknown2011-01-111-0/+14
| | |\ \ \ \ \ \ \ \ | | | |/ / / / / / / | | |/| | | | | | |
| | | * | | | | | | Merge 5.3-mwl89 into 5.3.unknown2010-12-031-0/+14
| | | |\ \ \ \ \ \ \
| | | | * \ \ \ \ \ \ MWL#89: Cost-based choice between Materialization and IN->EXISTS transformationunknown2010-11-051-0/+14
| | | | |\ \ \ \ \ \ \
| | | | | * | | | | | | MWL#89: Cost-based choice between Materialization and IN->EXISTS transformationunknown2010-09-051-0/+14
| | | | | | |/ / / / / | | | | | |/| | | | |
| * | | | | | | | | | Merge with MariaDB 5.2Michael Widenius2011-05-101-1/+9
| |\ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / | |/| | | | | | | | / | | | |_|_|_|_|_|_|/ | | |/| | | | | | |
| | * | | | | | | | Bug fix for lp:732124 union + limit returns wrong resultMichael Widenius2011-03-091-1/+9
| * | | | | | | | | Merge with 5.1-release.Michael Widenius2010-12-061-9/+0
| |\ \ \ \ \ \ \ \ \ | | |/ / / / / / / / | | | / / / / / / / | | |/ / / / / / / | |/| | | | | | |
| | * | | | | | | Merge with MySQL 5.1.53Michael Widenius2010-11-251-9/+0
| | |\ \ \ \ \ \ \ | | | | |_|_|_|/ / | | | |/| | | | |
| * | | | | | | | Fix LP BUG#680058unknown2010-11-251-5/+4
| | |_|/ / / / / | |/| | | | | |
* | | | | | | | 5.5-mergeSergei Golubchik2011-07-021-9/+1
|\ \ \ \ \ \ \ \ | | |_|_|_|_|/ / | |/| | | | | |
| * | | | | | | 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
| |\ \ \ \ \ \ \ | | | |_|/ / / / | | |/| | | | |