summaryrefslogtreecommitdiff
path: root/sql/sql_union.cc
Commit message (Expand)AuthorAgeFilesLines
* merge 5.5->10.0-baseunknown2013-10-291-1/+2
|\
| * Merge 5.3->5.5unknown2013-10-291-1/+2
| |\
| | * MDEV-5104 crash in Item_field::used_tables with broken order bytimour@askmonty.org2013-10-291-1/+2
* | | MDEV-3798: [SHOW] EXPLAIN UPDATE/DELETE, Memory leak in binlog.binlog_base64_...Sergey Petrunya2013-10-161-2/+4
* | | MDEV-3798: [SHOW] EXPLAIN UPDATE/DELETESergey Petrunya2013-10-151-0/+7
|\ \ \
| * | | MDEV-5106: Server crashes in Explain_union::print_explain on ER_TOO_BIG_SELECTSergey Petrunya2013-10-101-1/+1
| * | | MDEV-3798: EXPLAIN UPDATE/DELETESergey Petrunya2013-10-051-4/+4
| * | | [SHOW] EXPLAIN UPDATE/DELETE, code re-structuringSergey Petrunya2013-08-241-0/+7
| |\ \ \
| | * \ \ [SHOW] EXPLAIN UPDATE/DELETE, code re-structuringSergey Petrunya2013-08-241-0/+7
| | |\ \ \
| | | * | | [SHOW] EXPLAIN UPDATE/DELETE, code re-structuringSergey Petrunya2013-06-271-4/+5
| | | * | | [SHOW] EXPLAIN UPDATE/DELETE, code re-structuringSergey Petrunya2013-06-271-0/+6
* | | | | | 5.5 merge and fixes for compiler/test errorsSergei Golubchik2013-09-181-2/+4
|\ \ \ \ \ \ | |/ / / / / |/| | | / / | | |_|/ / | |/| | |
| * | | | MDEV-4978 - Server cursor is broken with blobs in the select list,Sergey Vojtovich2013-09-061-2/+4
* | | | | merge 5.5 -> 10.0-baseunknown2013-08-201-1/+1
|\ \ \ \ \ | |/ / / / | | / / / | |/ / / |/| | |
| * | | Fix of using uninitialized variadle.unknown2013-07-181-1/+1
* | | | 5.5 mergeSergei Golubchik2013-07-171-1/+4
|\ \ \ \ | |/ / / | | / / | |/ / |/| |
| * | mdev-4173: Wrong result (extra row) with semijoin=on, joins in outer query, L...Sergey Petrunya2013-07-161-1/+4
* | | 5.5 mergeSergei Golubchik2013-01-291-1/+1
|\ \ \ | |/ /
| * | Fixed some race conditons and bugs related to killed queriesMichael Widenius2013-01-111-1/+1
* | | Merge mdev-452 with the latest 10.0-base.unknown2012-10-181-1/+1
|\ \ \
| * | | MDEV-452 Add full support for auto-initialized/updated timestamp and datetimeunknown2012-10-171-1/+1
| |/ /
* | | SHOW EXPLAIN: merge with 5.5-mainSergey Petrunya2012-10-061-0/+2
|\ \ \ | |/ / |/| |
| * | MDEV-323: SHOW EXPLAIN: Plan produced by SHOW EXPLAIN loses 'UNION RESULT' lineSergey Petrunya2012-06-071-0/+2
* | | 5.3 mergeSergei Golubchik2012-08-271-0/+2
|\ \ \ | |/ / |/| / | |/
| * fix for MDEV-367unknown2012-08-251-0/+2
* | 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
| | |\ \ \ \ \