summaryrefslogtreecommitdiff
path: root/sql/sql_union.cc
Commit message (Expand)AuthorAgeFilesLines
* Merge branch '10.0' into 10.1Sergei Golubchik2016-08-251-0/+6
|\
| * Merge branch '5.5' into 10.0Sergei Golubchik2016-08-101-0/+6
| |\
| | * MDEV-9304: MariaDB crash with specific queryVicențiu Ciorbaru2016-08-081-0/+6
| * | Fix for MDEV-8321, MDEV-6223Sergei Petrunia2015-10-061-2/+0
* | | MDEV-9701: CREATE VIEW with GROUP BY or ORDER BY and constant produces invali...Oleksandr Byelkin2016-03-181-0/+11
* | | Merge branch '10.0' into 10.1Sergei Golubchik2015-09-031-1/+2
|\ \ \ | |/ /
| * | Merge commit '96badb16afcf' into 10.0Jan Lindström2015-08-031-1/+2
| |\ \ | | |/
| | * Fixed crashing bug when using ONLY_FULL_GROUP_BY in a stored procedure/trigge...Monty2015-06-251-1/+2
* | | Stage 2 of MDEV-6152:Monty2015-08-211-1/+3
* | | - Renaming variables so that they don't shadow others (After this patch one c...Monty2015-07-061-3/+3
* | | MDEV-7943 - pthread_getspecific() takes 0.76% in OLTP ROSergey Vojtovich2015-05-131-2/+5
* | | MDEV-7836: ANALYZE FORMAT=JSON should provide info about GROUP/ORDER BYSergei Petrunia2015-04-121-1/+1
* | | Merge branch '10.0' into bb-10.1-mergeSergei Golubchik2014-12-021-13/+13
|\ \ \ | |/ /
| * | 5.5 mergeSergei Golubchik2014-11-191-12/+12
| |\ \ | | |/
| | * MDEV-6868: MariaDB server crash ( select with union and order by with subque...unknown2014-11-151-12/+12
| * | MDEV-5120 Test suite test maria-no-logging failsMichael Widenius2014-09-301-1/+1
* | | Correction for the fix of the bug mdev-6874.Igor Babaev2014-10-191-0/+2
* | | Merge branch '10.1' of ../10.1-mdev334 into 10.1Igor Babaev2014-10-171-0/+1
|\ \ \
| * | | Fixed bug mdev-6874.Igor Babaev2014-10-171-0/+1
* | | | Merge branch 'bb-10.1-merge' into 10.1mariadb-10.1.1Sergei Golubchik2014-10-161-1/+2
|\ \ \ \ | |/ / / |/| / / | |/ /
| * | 5.5.39 mergeSergei Golubchik2014-08-071-1/+2
| |\ \ | | |/
| | * mysql-5.5.39 mergeSergei Golubchik2014-08-021-1/+7
| | |\
| | | * Bug #17059925: UNIONS COMPUTES ROWS_EXAMINED INCORRECTLYmithun2014-05-081-1/+7
| | | * Bug #18167356: EXPLAIN W/ EXISTS(SELECT* UNION SELECT*)mithun2014-04-281-0/+29
* | | | MDEV-334: Backport of UNION ALL optimization from mysql-5.7.Igor Babaev2014-10-141-56/+197
|/ / /
* | | 10.0-base mergeSergei Golubchik2014-02-261-0/+3
|\ \ \
| * \ \ 5.5 mergeSergei Golubchik2014-02-251-0/+3
| |\ \ \ | | |/ /
| | * | 5.3 mergeSergei Golubchik2014-02-141-1/+2
| | |\ \
| | | * | MDEV-714 LP:1020645 - crash (sig 11) with union querySergei Golubchik2014-02-131-1/+2
* | | | | MDEV-5314 - Compiling fails on OSX using clangSergey Vojtovich2014-02-191-3/+3
* | | | | 10.0-base mergeSergei Golubchik2014-02-031-1/+4
|\ \ \ \ \ | |/ / / /
| * | | | 5.5 mergeSergei Golubchik2014-02-011-1/+4
| |\ \ \ \ | | |/ / /
| | * | | Merge 5.3->5.5unknown2014-01-151-1/+4
| | |\ \ \ | | | |/ /
* | | | | 10.0-base mergeSergei Golubchik2013-12-161-4/+14
|\ \ \ \ \ | |/ / / /
| * | | | 5.5 mergeSergei Golubchik2013-12-151-4/+14
| |\ \ \ \ | | |/ / /
| | * | | 5.3 mergeSergei Golubchik2013-12-131-4/+14
| | |\ \ \ | | | |/ /
| | | * | Fixed bug mdev-5410.Igor Babaev2013-12-121-4/+13
| | | * | Another attempt to fix the memory leak of mdev-5400.Igor Babaev2013-12-111-0/+1
* | | | | merge 10.0-base -> 10.0unknown2013-10-291-1/+2
|\ \ \ \ \ | |/ / / /
| * | | | 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
* | | | | Merge 10.0-base -> 10.0Sergey Petrunya2013-10-161-0/+9
|\ \ \ \ \ | |/ / / /
| * | | | 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