summaryrefslogtreecommitdiff
path: root/sql/sql_select.cc
Commit message (Expand)AuthorAgeFilesLines
* Merge bb-10.2-ext into 10.3Marko Mäkelä2017-09-141-8/+11
|\
| * Fixed the bug mdev-13710.Igor Babaev2017-09-091-4/+2
| * Fixed the bug mdev-13709.Igor Babaev2017-09-081-4/+9
* | simplify READ_RECORD usage NFCEugene Kosov2017-08-311-15/+15
* | Merge branch 'bb-10.2-ext' into 10.3Sergei Golubchik2017-08-261-2/+7
|\ \ | |/
| * Merge branch '10.2' into bb-10.2-extSergei Golubchik2017-08-251-2/+7
| |\
| | * Merge branch '10.1' into 10.2Sergei Golubchik2017-08-171-1/+1
| | |\
| | | * MDEV-13179 main.errors fails with wrong errnoMonty2017-08-071-1/+1
| | * | Fixed the bug mdev-13346.Igor Babaev2017-08-151-1/+6
* | | | Changed KEY names to use LEX_CSTRINGMichael Widenius2017-08-241-5/+9
* | | | New option for slow logging (log_slow_disable_statements)Monty2017-08-241-5/+5
* | | | Enusure that my_global.h is included firstMichael Widenius2017-08-241-1/+1
* | | | Merge remote-tracking branch 'origin/bb-10.2-ext' into 10.3Alexander Barkov2017-08-151-40/+358
|\ \ \ \ | |/ / /
| * | | This is a modification of the first patch committed for mdev-13369Igor Babaev2017-08-101-5/+18
| * | | This first patch prepared for the task MDEV-13369:Igor Babaev2017-08-101-40/+345
* | | | Merge remote-tracking branch 'origin/bb-10.2-ext' into 10.3Marko Mäkelä2017-08-091-2/+6
|\ \ \ \ | |/ / /
| * | | Merge remote-tracking branch 'origin/10.2' into bb-10.2-extAlexander Barkov2017-08-071-2/+6
| |\ \ \ | | |/ /
| | * | MDEV-13374: Server crashes in first_linear_tab / st_select_lex::set_explain_typeSergei Petrunia2017-08-071-2/+6
* | | | Merge remote-tracking branch 'origin/bb-10.2-ext' into 10.3Alexander Barkov2017-07-311-1/+7
|\ \ \ \ | |/ / /
| * | | Merge commit 'e2afdb1ee430cb9d030aeeedc85eb903cda5e5d1' into bb-10.2-extAlexander Barkov2017-07-211-1/+7
| |\ \ \ | | |/ /
| | * | MDEV-13352: Server crashes in st_join_table::remove_duplicatesSergei Petrunia2017-07-211-1/+7
* | | | Merge bb-10.2-ext into 10.3Marko Mäkelä2017-07-071-6/+71
|\ \ \ \ | |/ / /
| * | | Merge remote-tracking branch 'origin/10.2' into bb-10.2-extAlexander Barkov2017-07-071-6/+71
| |\ \ \ | | |/ /
| | * | Merge branch '10.1' into 10.2Sergei Golubchik2017-07-051-6/+71
| | |\ \ | | | |/
| | | * Merge branch 'bb-10.1-vicentiu' into 10.1Vicențiu Ciorbaru2017-06-271-5/+70
| | | |\
| | | | * Merge remote-tracking branch '10.0' into 10.1Vicențiu Ciorbaru2017-06-211-5/+70
| | | | |\
| | | | | * Merge remote-tracking branch '5.5' into 10.0Vicențiu Ciorbaru2017-06-201-5/+70
| | | | | |\
| | | | | | * Fixed the bug mdev-12855.Igor Babaev2017-06-071-1/+4
| | | | | | * Fixed the bug mdev-12963.Igor Babaev2017-06-071-0/+1
| | | | | | * Fixed the bug mdev-12838.Igor Babaev2017-06-071-5/+66
| | | * | | | MDEV-10880: Assertions `keypart_map' or `prebuilt->search_tuple->n_fields > 0...Oleksandr Byelkin2017-06-231-1/+1
| | | |/ / /
* | | | | | Merge remote-tracking branch 'origin/bb-10.2-ext' into 10.3Alexander Barkov2017-07-051-13/+9
|\ \ \ \ \ \ | |/ / / / /
| * | | | | Merge remote-tracking branch 'origin/10.2' into bb-10.2-extAlexander Barkov2017-07-041-13/+9
| |\ \ \ \ \ | | |/ / / /
| | * | | | MDEV-13226 Server crashes when tmpdir runs out of spaceMonty2017-07-011-1/+2
| | * | | | Added tmp_disk_table_size to limit size of Aria temp tables in tmpdirMonty2017-06-301-12/+7
* | | | | | Merge bb-10.2-ext into 10.3Marko Mäkelä2017-06-191-23/+37
|\ \ \ \ \ \ | |/ / / / /
| * | | | | Merge 10.2 into bb-10.2-extMarko Mäkelä2017-06-191-15/+18
| |\ \ \ \ \ | | |/ / / /
| | * | | | Fixed the bug mdev-13064.Igor Babaev2017-06-161-15/+18
| * | | | | Merge remote-tracking branch 'origin/10.2' into bb-10.2-extAlexander Barkov2017-06-151-8/+19
| |\ \ \ \ \ | | |/ / / /
| | * | | | Merge 10.1 into 10.2Marko Mäkelä2017-06-081-1/+2
| | |\ \ \ \ | | | |/ / /
| | | * | | Fixed the bug mdev-12931.mariadb-10.1.24Igor Babaev2017-05-291-1/+2
| | * | | | Merge 10.1 into 10.2Marko Mäkelä2017-05-231-5/+13
| | |\ \ \ \ | | | |/ / /
| | | * | | Merge 10.0 into 10.1Marko Mäkelä2017-05-201-5/+13
| | | |\ \ \ | | | | |/ /
| | | | * | Merge remote-tracking branch 'origin/5.5' into 10.0Vicențiu Ciorbaru2017-05-171-5/+13
| | | | |\ \ | | | | | |/
| | | | | * Fixed the bug mdev-7791.Igor Babaev2017-05-161-5/+13
| | * | | | Fixed the bug mdev-12788.Igor Babaev2017-05-181-2/+4
* | | | | | Merge branch 'bb-10.2-ext' into 10.3Marko Mäkelä2017-06-021-37/+62
|\ \ \ \ \ \ | |/ / / / /
| * | | | | Merge tag 'mariadb-10.2.6' into bb-10.2-extAlexander Barkov2017-05-261-10/+22
| |\ \ \ \ \ | | |/ / / /
| | * | | | Merge branch '10.1' into 10.2Sergei Golubchik2017-05-091-7/+18
| | |\ \ \ \ | | | |/ / /
| | | * | | Merge branch '10.0' into 10.1Sergei Golubchik2017-05-081-5/+7
| | | |\ \ \ | | | | |/ /