summaryrefslogtreecommitdiff
path: root/sql/sql_select.cc
Commit message (Expand)AuthorAgeFilesLines
* cleanup: s/const CHARSET_INFO/CHARSET_INFO/Sergei Golubchik2014-12-041-1/+1
* Merge branch '10.1' into bb-10.1-mergeSergei Golubchik2014-12-031-261/+139
|\
| * Code cleanupSergei Petrunia2014-12-021-77/+0
| * EXPLAIN FORMAT=JSONSergei Petrunia2014-12-021-0/+7
| * EXPLAIN FORMAT=JSON: Do set usable_key_parts for key in the temp. tableSergei Petrunia2014-12-021-0/+1
| * EXPLAIN FORMAT=JSON: support SJ-MaterializationSergei Petrunia2014-12-011-24/+76
| * EXPLAIN FORMAT=JSON: Add support for non-merged semi-joinsSergei Petrunia2014-11-291-2/+7
| * EXPLAIN FORMAT=JSON: support derived tablesSergei Petrunia2014-11-281-0/+10
| * EXPLAIN FORMAT=JSON: Add support for single-table UPDATE/DELETE.Sergei Petrunia2014-11-281-130/+2
| * EXPLAIN FORMAT=JSON: support join bufferingSergei Petrunia2014-11-271-7/+7
| * Merge ../10.1-explain-json-r4 into 10.1Sergei Petrunia2014-11-271-35/+43
| |\
| | * Better commentsSergei Petrunia2014-11-201-0/+18
| | * Merge ../10.1 into bb-10.1-explain-jsonSergei Petrunia2014-10-151-152/+297
| | |\
| | * | EXPLAIN FORMAT=JSON: produce used_key_parts, JSON-ish output for index_merge.Sergei Petrunia2014-08-141-4/+6
| | * | EXPLAIN FORMAT=JSON: produce the 'ref' column.Sergei Petrunia2014-08-121-31/+5
| | * | Merge 10.1 (with ANALYZE) and 10.1-explain-jsonSergei Petrunia2014-08-091-8/+22
| | |\ \
| | | * | MDEV-6109: EXPLAIN JSON10.1-explain-jsonSergei Petrunia2014-05-271-8/+20
* | | | | Merge branch '10.0' into bb-10.1-mergeSergei Golubchik2014-12-021-12/+82
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | MergeSergei Golubchik2014-11-211-1/+1
| |\ \ \ \
| | * | | | MDEV-6785 Wrong result on 2nd execution of PS with aggregate function, FROM S...Sergei Golubchik2014-11-181-1/+1
| * | | | | MDEV-6978 Bad results with join comparing case insensitive VARCHAR/ENUM/SETAlexander Barkov2014-11-191-0/+22
| |/ / / /
| * | | | MDEV-6950 Bad results with joins comparing DATE/DATETIME and INT/DECIMAL/DOUB...Alexander Barkov2014-11-181-0/+4
| * | | | 5.5 mergeSergei Golubchik2014-11-031-0/+3
| |\ \ \ \
| | * \ \ \ MergeSergey Petrunya2014-10-291-5/+41
| | |\ \ \ \
| | * | | | | MDEV-6484: Assertion `tab->ref.use_count' failed on query with joins, constan...Sergey Petrunya2014-10-141-0/+3
| * | | | | | MergeSergey Petrunya2014-10-291-4/+27
| |\ \ \ \ \ \ | | | |/ / / / | | |/| | | |
| | * | | | | Merge 5.3->5.5Sergey Petrunya2014-10-291-5/+41
| | |\ \ \ \ \ | | | |/ / / / | | |/| | | |
| | | * | | | MDEV-6879: Dereference of NULL primary_file->table in DsMrr_impl::get_disk_sw...Sergey Petrunya2014-10-291-1/+14
| | | * | | | MDEV-6888: Query spends a long time in best_extension_by_limited_search with ...Sergey Petrunya2014-10-291-4/+27
| * | | | | | MergeIgor Babaev2014-10-281-2/+1
| |\ \ \ \ \ \
| | * | | | | | Fixed bug mdev-6325.Igor Babaev2014-10-281-2/+1
| * | | | | | | MergeSergey Petrunya2014-10-211-14/+14
| |\ \ \ \ \ \ \ | | |/ / / / / / | |/| | | | | |
| | * | | | | | MDEV-6879: Dereference of NULL primary_file->table in DsMrr_impl::get_disk_sw...Sergey Petrunya2014-10-201-1/+14
| * | | | | | | MDEV-6879: Dereference of NULL primary_file->table in DsMrr_impl::get_disk_sw...Sergey Petrunya2014-10-161-1/+14
| |/ / / / / /
| * | | | | | 5.5.40+ mergeSergei Golubchik2014-10-091-1/+1
| |\ \ \ \ \ \ | | |/ / / / /
| | * | | | | MDEV-5553 A view or procedure with a non existing definer can block "SHOW TAB...Sergei Golubchik2014-10-071-1/+1
| | * | | | | MDEV-6743 crash in GROUP_CONCAT(IF () ORDER BY 1)Sergei Golubchik2014-10-031-1/+1
| * | | | | | Auto mergeMichael Widenius2014-09-301-0/+1
| |\ \ \ \ \ \
| | * | | | | | MDEV-5120 Test suite test maria-no-logging failsMichael Widenius2014-09-301-0/+1
| * | | | | | | MDEV-6808, part#2.Sergey Petrunya2014-09-301-2/+5
| * | | | | | | MDEV-6808: MariaDB 10.0.13 crash with optimizer_use_condition_selectivity > 1Sergey Petrunya2014-09-301-1/+2
| |/ / / / / /
* | | | | | | Merge branch 'bb-10.1-merge' into 10.1mariadb-10.1.1Sergei Golubchik2014-10-161-62/+104
|\ \ \ \ \ \ \
| * \ \ \ \ \ \ Merge 10.0.14 into 10.1Sergei Golubchik2014-10-151-62/+104
| |\ \ \ \ \ \ \ | | |/ / / / / / | | | | | | | / | | |_|_|_|_|/ | |/| | | | |
| | * | | | | MDEV-6743 crash in GROUP_CONCAT(IF () ORDER BY 1)mariadb-10.0.14Sergei Golubchik2014-09-241-1/+1
| | * | | | | Fixed test failuresMichael Widenius2014-09-221-3/+4
| | * | | | | 5.5 mergeSergei Golubchik2014-09-161-6/+41
| | |\ \ \ \ \ | | | |/ / / /
| | | * | | | 5.3 mergeSergei Golubchik2014-09-121-6/+41
| | | |\ \ \ \ | | | | |/ / /
| | | | * | | Merge.Igor Babaev2014-08-041-6/+41
| | | | |\ \ \
| | | | | * | | Fixed bug mdev-5721.Igor Babaev2014-07-311-6/+41
| | * | | | | | Adding Item_string_sys and Item_string_ascii to reduce duplicate codeAlexander Barkov2014-09-031-30/+17
View Lorry Controller Status