Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge 10.1 into 10.2 | Marko Mäkelä | 2019-05-13 | 1 | -1/+1 |
|\ | |||||
| * | Merge branch '5.5' into 10.1 | Vicențiu Ciorbaru | 2019-05-11 | 1 | -1/+1 |
| |\ | |||||
| | * | Update FSF Address | Vicențiu Ciorbaru | 2019-05-11 | 1 | -1/+1 |
* | | | Merge 10.1 into 10.2 | Marko Mäkelä | 2019-03-04 | 1 | -30/+1 |
|\ \ \ | |/ / | |||||
| * | | Merge branch '10.0' into 10.1 | Oleksandr Byelkin | 2019-03-01 | 1 | -30/+1 |
| |\ \ | |||||
| | * \ | Merge branch '5.5' into 10.0 | Oleksandr Byelkin | 2019-02-28 | 1 | -30/+1 |
| | |\ \ | | | |/ | |||||
| | | * | MDEV-17055: Server crashes in find_order_in_list upon 2nd (3rd) execution of ... | Oleksandr Byelkin | 2019-02-28 | 1 | -2/+2 |
| | | * | A cleanup in derived table handling: removing duplicate code from st_select_l... | Alexander Barkov | 2019-02-28 | 1 | -30/+0 |
* | | | | MDEV-17024 Crash on large query | Igor Babaev | 2018-09-07 | 1 | -1/+5 |
* | | | | don't set derived->merged until derived is really irreversibly merged | Sergei Golubchik | 2018-02-06 | 1 | -1/+1 |
* | | | | Merge branch 'github/10.1' into 10.2 | Sergei Golubchik | 2018-02-06 | 1 | -0/+20 |
|\ \ \ \ | |/ / / | |||||
| * | | | Merge branch 'github/10.0' into 10.1 | Sergei Golubchik | 2018-02-02 | 1 | -0/+20 |
| |\ \ \ | | |/ / | |||||
| | * | | Merge remote-tracking branch '5.5' into 10.0 | Vicențiu Ciorbaru | 2018-01-24 | 1 | -0/+20 |
| | |\ \ | | | |/ | |||||
| | | * | MDEV-14786: Server crashes in Item_cond::transform on 2nd execution of SP que... | Oleksandr Byelkin | 2018-01-23 | 1 | -0/+20 |
* | | | | Merge 10.1 into 10.2, with some MDEV-14799 fixupsmariadb-10.2.12 | Marko Mäkelä | 2018-01-03 | 1 | -6/+47 |
|\ \ \ \ | |/ / / | |||||
| * | | | Merge 10.0 into 10.1 | Marko Mäkelä | 2018-01-02 | 1 | -5/+46 |
| |\ \ \ | | |/ / | |||||
| | * | | Merge 5.5 into 10.0 | Marko Mäkelä | 2018-01-02 | 1 | -5/+46 |
| | |\ \ | | | |/ | |||||
| | | * | MDEV-10657: incorrect result returned with binary protocol (prepared statements) | Oleksandr Byelkin | 2017-12-27 | 1 | -2/+46 |
* | | | | Merge remote-tracking branch 'origin/10.1' into 10.2 | Alexander Barkov | 2017-11-09 | 1 | -2/+4 |
|\ \ \ \ | |/ / / | |||||
| * | | | Merge remote-tracking branch 'origin/10.0' into 10.1 | Alexander Barkov | 2017-11-09 | 1 | -2/+4 |
| |\ \ \ | | |/ / | |||||
| | * | | MDEV-14164: Unknown column error when adding aggregate to function in oracle ... | Oleksandr Byelkin | 2017-11-09 | 1 | -2/+4 |
| * | | | Merge branch '10.0' into 10.1 | Vicențiu Ciorbaru | 2017-09-19 | 1 | -2/+2 |
| |\ \ \ | | |/ / | |||||
| | * | | Merge branch '5.5' into 10.0 | Vicențiu Ciorbaru | 2017-09-19 | 1 | -2/+2 |
| | |\ \ | | | |/ | |||||
| | | * | MDEV-11240: Server crashes in check_view_single_update or Assertion `derived-... | Oleksandr Byelkin | 2017-08-16 | 1 | -2/+2 |
* | | | | MDEV-13844 : Fix Windows warnings. Fix DBUG_PRINT. | Vladislav Vaintroub | 2017-09-28 | 1 | -1/+1 |
* | | | | MDEV-11240: Server crashes in check_view_single_update or Assertion `derived-...mariadb-10.2.8 | Oleksandr Byelkin | 2017-08-17 | 1 | -2/+2 |
* | | | | Merge branch '10.1' into 10.2 | Sergei Golubchik | 2017-08-17 | 1 | -0/+2 |
|\ \ \ \ | |/ / / | |||||
| * | | | Merge branch '10.0' into 10.1 | Sergei Golubchik | 2017-08-08 | 1 | -0/+2 |
| |\ \ \ | | |/ / | |||||
| | * | | Merge remote-tracking branch 'origin/5.5' into 10.0 | Vicențiu Ciorbaru | 2017-07-25 | 1 | -0/+2 |
| | |\ \ | | | |/ | |||||
| | | * | MDEV-11240: Server crashes in check_view_single_update or Assertion `derived-... | Oleksandr Byelkin | 2017-07-18 | 1 | -1/+3 |
* | | | | MDEV-13439: Database permissions are not enough to run a subquery with GROUP ... | Oleksandr Byelkin | 2017-08-10 | 1 | -3/+4 |
* | | | | Fixed the bug mdev-12845. | Igor Babaev | 2017-06-22 | 1 | -2/+3 |
* | | | | Fixed the bug mdev-12563. | Igor Babaev | 2017-04-28 | 1 | -0/+17 |
* | | | | Fixed the bug mdev-12373. | Igor Babaev | 2017-04-24 | 1 | -0/+3 |
* | | | | Merge branch '10.1' into 10.2 | Sergei Golubchik | 2017-03-30 | 1 | -0/+3 |
|\ \ \ \ | |/ / / | |||||
| * | | | Merge 10.0 into 10.1 | Marko Mäkelä | 2017-03-09 | 1 | -0/+3 |
| |\ \ \ | | |/ / | |||||
| | * | | Merge branch '5.5' into 10.0 | Vicențiu Ciorbaru | 2017-03-03 | 1 | -0/+3 |
| | |\ \ | | | |/ | |||||
| | | * | Fixed bug mdev-12099. | Igor Babaev | 2017-02-27 | 1 | -0/+3 |
* | | | | Fixed bug mdev-12368. | Igor Babaev | 2017-03-26 | 1 | -3/+6 |
* | | | | Fixed bug mdev-11820. | Igor Babaev | 2017-01-24 | 1 | -0/+5 |
* | | | | Such big blocks in query processing should be represented in the debugging tr... | Oleksandr Byelkin | 2017-01-18 | 1 | -7/+8 |
* | | | | Fixed bug mdev-11674. | Igor Babaev | 2017-01-04 | 1 | -1/+4 |
* | | | | Merge branch '10.1' into 10.2 | Sergei Golubchik | 2016-12-29 | 1 | -0/+1 |
|\ \ \ \ | |/ / / | |||||
| * | | | Merge branch '10.0' into 10.1 | Sergei Golubchik | 2016-12-11 | 1 | -0/+1 |
| |\ \ \ | | |/ / | |||||
| | * | | Merge branch '5.5' into 10.0 | Sergei Golubchik | 2016-12-09 | 1 | -0/+2 |
| | |\ \ | | | |/ | |||||
| | | * | Fixed bug mdev-11161. | Igor Babaev | 2016-11-11 | 1 | -0/+2 |
* | | | | Fixed bug mdev-11313. | Igor Babaev | 2016-11-26 | 1 | -5/+5 |
* | | | | Fixed bug mdev-11072. | Igor Babaev | 2016-11-15 | 1 | -2/+4 |
* | | | | Fixed bug mdev-10884.mariadb-10.2.2 | Igor Babaev | 2016-09-25 | 1 | -11/+15 |
* | | | | Another attempt to fix bug mdev-10785 + cleanup for the previous attempt. | Igor Babaev | 2016-09-14 | 1 | -8/+1 |