Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge remote-tracking branch 'origin/bb-10.2-ext' into 10.3 | Alexander Barkov | 2017-08-15 | 1 | -40/+358 |
|\ | |||||
| * | This is a modification of the first patch committed for mdev-13369 | Igor Babaev | 2017-08-10 | 1 | -5/+18 |
| * | This first patch prepared for the task MDEV-13369: | Igor Babaev | 2017-08-10 | 1 | -40/+345 |
* | | Merge remote-tracking branch 'origin/bb-10.2-ext' into 10.3 | Marko Mäkelä | 2017-08-09 | 1 | -2/+6 |
|\ \ | |/ | |||||
| * | Merge remote-tracking branch 'origin/10.2' into bb-10.2-ext | Alexander Barkov | 2017-08-07 | 1 | -2/+6 |
| |\ | |||||
| | * | MDEV-13374: Server crashes in first_linear_tab / st_select_lex::set_explain_type | Sergei Petrunia | 2017-08-07 | 1 | -2/+6 |
* | | | Merge remote-tracking branch 'origin/bb-10.2-ext' into 10.3 | Alexander Barkov | 2017-07-31 | 1 | -1/+7 |
|\ \ \ | |/ / | |||||
| * | | Merge commit 'e2afdb1ee430cb9d030aeeedc85eb903cda5e5d1' into bb-10.2-ext | Alexander Barkov | 2017-07-21 | 1 | -1/+7 |
| |\ \ | | |/ | |||||
| | * | MDEV-13352: Server crashes in st_join_table::remove_duplicates | Sergei Petrunia | 2017-07-21 | 1 | -1/+7 |
* | | | Merge bb-10.2-ext into 10.3 | Marko Mäkelä | 2017-07-07 | 1 | -6/+71 |
|\ \ \ | |/ / | |||||
| * | | Merge remote-tracking branch 'origin/10.2' into bb-10.2-ext | Alexander Barkov | 2017-07-07 | 1 | -6/+71 |
| |\ \ | | |/ | |||||
| | * | Merge branch '10.1' into 10.2 | Sergei Golubchik | 2017-07-05 | 1 | -6/+71 |
| | |\ | |||||
| | | * | Merge branch 'bb-10.1-vicentiu' into 10.1 | Vicențiu Ciorbaru | 2017-06-27 | 1 | -5/+70 |
| | | |\ | |||||
| | | | * | Merge remote-tracking branch '10.0' into 10.1 | Vicențiu Ciorbaru | 2017-06-21 | 1 | -5/+70 |
| | | | |\ | |||||
| | | | | * | Merge remote-tracking branch '5.5' into 10.0 | Vicențiu Ciorbaru | 2017-06-20 | 1 | -5/+70 |
| | | | | |\ | |||||
| | | | | | * | Fixed the bug mdev-12855. | Igor Babaev | 2017-06-07 | 1 | -1/+4 |
| | | | | | * | Fixed the bug mdev-12963. | Igor Babaev | 2017-06-07 | 1 | -0/+1 |
| | | | | | * | Fixed the bug mdev-12838. | Igor Babaev | 2017-06-07 | 1 | -5/+66 |
| | | * | | | | MDEV-10880: Assertions `keypart_map' or `prebuilt->search_tuple->n_fields > 0... | Oleksandr Byelkin | 2017-06-23 | 1 | -1/+1 |
| | | |/ / / | |||||
* | | | | | | Merge remote-tracking branch 'origin/bb-10.2-ext' into 10.3 | Alexander Barkov | 2017-07-05 | 1 | -13/+9 |
|\ \ \ \ \ \ | |/ / / / / | |||||
| * | | | | | Merge remote-tracking branch 'origin/10.2' into bb-10.2-ext | Alexander Barkov | 2017-07-04 | 1 | -13/+9 |
| |\ \ \ \ \ | | |/ / / / | |||||
| | * | | | | MDEV-13226 Server crashes when tmpdir runs out of space | Monty | 2017-07-01 | 1 | -1/+2 |
| | * | | | | Added tmp_disk_table_size to limit size of Aria temp tables in tmpdir | Monty | 2017-06-30 | 1 | -12/+7 |
* | | | | | | Merge bb-10.2-ext into 10.3 | Marko Mäkelä | 2017-06-19 | 1 | -23/+37 |
|\ \ \ \ \ \ | |/ / / / / | |||||
| * | | | | | Merge 10.2 into bb-10.2-ext | Marko Mäkelä | 2017-06-19 | 1 | -15/+18 |
| |\ \ \ \ \ | | |/ / / / | |||||
| | * | | | | Fixed the bug mdev-13064. | Igor Babaev | 2017-06-16 | 1 | -15/+18 |
| * | | | | | Merge remote-tracking branch 'origin/10.2' into bb-10.2-ext | Alexander Barkov | 2017-06-15 | 1 | -8/+19 |
| |\ \ \ \ \ | | |/ / / / | |||||
| | * | | | | Merge 10.1 into 10.2 | Marko Mäkelä | 2017-06-08 | 1 | -1/+2 |
| | |\ \ \ \ | | | |/ / / | |||||
| | | * | | | Fixed the bug mdev-12931.mariadb-10.1.24 | Igor Babaev | 2017-05-29 | 1 | -1/+2 |
| | * | | | | Merge 10.1 into 10.2 | Marko Mäkelä | 2017-05-23 | 1 | -5/+13 |
| | |\ \ \ \ | | | |/ / / | |||||
| | | * | | | Merge 10.0 into 10.1 | Marko Mäkelä | 2017-05-20 | 1 | -5/+13 |
| | | |\ \ \ | | | | |/ / | |||||
| | | | * | | Merge remote-tracking branch 'origin/5.5' into 10.0 | Vicențiu Ciorbaru | 2017-05-17 | 1 | -5/+13 |
| | | | |\ \ | | | | | |/ | |||||
| | | | | * | Fixed the bug mdev-7791. | Igor Babaev | 2017-05-16 | 1 | -5/+13 |
| | * | | | | Fixed the bug mdev-12788. | Igor Babaev | 2017-05-18 | 1 | -2/+4 |
* | | | | | | Merge branch 'bb-10.2-ext' into 10.3 | Marko Mäkelä | 2017-06-02 | 1 | -37/+62 |
|\ \ \ \ \ \ | |/ / / / / | |||||
| * | | | | | Merge tag 'mariadb-10.2.6' into bb-10.2-ext | Alexander Barkov | 2017-05-26 | 1 | -10/+22 |
| |\ \ \ \ \ | | |/ / / / | |||||
| | * | | | | Merge branch '10.1' into 10.2 | Sergei Golubchik | 2017-05-09 | 1 | -7/+18 |
| | |\ \ \ \ | | | |/ / / | |||||
| | | * | | | Merge branch '10.0' into 10.1 | Sergei Golubchik | 2017-05-08 | 1 | -5/+7 |
| | | |\ \ \ | | | | |/ / | |||||
| | | | * | | Merge branch '5.5' into 10.0 | Sergei Golubchik | 2017-05-08 | 1 | -5/+7 |
| | | | |\ \ | | | | | |/ | |||||
| | | | | * | Fixed the bug mdev-12673. | Igor Babaev | 2017-05-04 | 1 | -5/+7 |
| | | * | | | Merge branch '10.0' 10.1 | Sergei Golubchik | 2017-04-28 | 1 | -7/+16 |
| | | |\ \ \ | | | | |/ / | |||||
| | | | * | | Merge branch '5.5' into bb-10.0-merge-5.5bb-10.0-merge-5.5 | Oleksandr Byelkin | 2017-04-25 | 1 | -6/+15 |
| | | | |\ \ | | | | | |/ | |||||
| | | | | * | Fixed the bug mdev-10693. | Igor Babaev | 2017-04-24 | 1 | -6/+15 |
| | | | * | | Merge branch '5.5' into 10.0 | Sergei Golubchik | 2017-04-21 | 1 | -1/+1 |
| | | | |\ \ | | | | | |/ | |||||
| | | | | * | Fixed the bug mdev-12429 and its duplicates mdev-12145 and mdev-9886. | Igor Babaev | 2017-04-04 | 1 | -1/+1 |
| | * | | | | MDEV-12580 Wrong query result in join when using an index (Version > "10.2.3") | Sergei Golubchik | 2017-05-08 | 1 | -3/+4 |
| * | | | | | Fixing a few data type related problems: MDEV-12875, MDEV-12886, MDEV-12916 | Alexander Barkov | 2017-05-25 | 1 | -14/+29 |
| * | | | | | MDEV-12858 + MDEV+12859 + MDEV-12862 - a join patch fixing a few data type pr... | Alexander Barkov | 2017-05-22 | 1 | -15/+13 |
* | | | | | | Merge remote-tracking branch 'origin/bb-10.2-ext' into 10.3 | Alexander Barkov | 2017-05-07 | 1 | -32/+54 |
|\ \ \ \ \ \ | |/ / / / / | |||||
| * | | | | | MDEV-12717 Change Item_equal to operate Type_handler rather than Item_result | Alexander Barkov | 2017-05-07 | 1 | -6/+17 |