summaryrefslogtreecommitdiff
path: root/sql/sql_derived.cc
Commit message (Expand)AuthorAgeFilesLines
* MDEV-17024 Crash on large queryIgor Babaev2018-09-071-1/+5
* don't set derived->merged until derived is really irreversibly mergedSergei Golubchik2018-02-061-1/+1
* Merge branch 'github/10.1' into 10.2Sergei Golubchik2018-02-061-0/+20
|\
| * Merge branch 'github/10.0' into 10.1Sergei Golubchik2018-02-021-0/+20
| |\
| | * Merge remote-tracking branch '5.5' into 10.0Vicențiu Ciorbaru2018-01-241-0/+20
| | |\
| | | * MDEV-14786: Server crashes in Item_cond::transform on 2nd execution of SP que...Oleksandr Byelkin2018-01-231-0/+20
* | | | Merge 10.1 into 10.2, with some MDEV-14799 fixupsmariadb-10.2.12Marko Mäkelä2018-01-031-6/+47
|\ \ \ \ | |/ / /
| * | | Merge 10.0 into 10.1Marko Mäkelä2018-01-021-5/+46
| |\ \ \ | | |/ /
| | * | Merge 5.5 into 10.0Marko Mäkelä2018-01-021-5/+46
| | |\ \ | | | |/
| | | * MDEV-10657: incorrect result returned with binary protocol (prepared statements)Oleksandr Byelkin2017-12-271-2/+46
* | | | Merge remote-tracking branch 'origin/10.1' into 10.2Alexander Barkov2017-11-091-2/+4
|\ \ \ \ | |/ / /
| * | | Merge remote-tracking branch 'origin/10.0' into 10.1Alexander Barkov2017-11-091-2/+4
| |\ \ \ | | |/ /
| | * | MDEV-14164: Unknown column error when adding aggregate to function in oracle ...Oleksandr Byelkin2017-11-091-2/+4
| * | | Merge branch '10.0' into 10.1Vicențiu Ciorbaru2017-09-191-2/+2
| |\ \ \ | | |/ /
| | * | Merge branch '5.5' into 10.0Vicențiu Ciorbaru2017-09-191-2/+2
| | |\ \ | | | |/
| | | * MDEV-11240: Server crashes in check_view_single_update or Assertion `derived-...Oleksandr Byelkin2017-08-161-2/+2
* | | | MDEV-13844 : Fix Windows warnings. Fix DBUG_PRINT.Vladislav Vaintroub2017-09-281-1/+1
* | | | MDEV-11240: Server crashes in check_view_single_update or Assertion `derived-...mariadb-10.2.8Oleksandr Byelkin2017-08-171-2/+2
* | | | Merge branch '10.1' into 10.2Sergei Golubchik2017-08-171-0/+2
|\ \ \ \ | |/ / /
| * | | Merge branch '10.0' into 10.1Sergei Golubchik2017-08-081-0/+2
| |\ \ \ | | |/ /
| | * | Merge remote-tracking branch 'origin/5.5' into 10.0Vicențiu Ciorbaru2017-07-251-0/+2
| | |\ \ | | | |/
| | | * MDEV-11240: Server crashes in check_view_single_update or Assertion `derived-...Oleksandr Byelkin2017-07-181-1/+3
* | | | MDEV-13439: Database permissions are not enough to run a subquery with GROUP ...Oleksandr Byelkin2017-08-101-3/+4
* | | | Fixed the bug mdev-12845.Igor Babaev2017-06-221-2/+3
* | | | Fixed the bug mdev-12563.Igor Babaev2017-04-281-0/+17
* | | | Fixed the bug mdev-12373.Igor Babaev2017-04-241-0/+3
* | | | Merge branch '10.1' into 10.2Sergei Golubchik2017-03-301-0/+3
|\ \ \ \ | |/ / /
| * | | Merge 10.0 into 10.1Marko Mäkelä2017-03-091-0/+3
| |\ \ \ | | |/ /
| | * | Merge branch '5.5' into 10.0Vicențiu Ciorbaru2017-03-031-0/+3
| | |\ \ | | | |/
| | | * Fixed bug mdev-12099.Igor Babaev2017-02-271-0/+3
* | | | Fixed bug mdev-12368.Igor Babaev2017-03-261-3/+6
* | | | Fixed bug mdev-11820.Igor Babaev2017-01-241-0/+5
* | | | Such big blocks in query processing should be represented in the debugging tr...Oleksandr Byelkin2017-01-181-7/+8
* | | | Fixed bug mdev-11674.Igor Babaev2017-01-041-1/+4
* | | | Merge branch '10.1' into 10.2Sergei Golubchik2016-12-291-0/+1
|\ \ \ \ | |/ / /
| * | | Merge branch '10.0' into 10.1Sergei Golubchik2016-12-111-0/+1
| |\ \ \ | | |/ /
| | * | Merge branch '5.5' into 10.0Sergei Golubchik2016-12-091-0/+2
| | |\ \ | | | |/
| | | * Fixed bug mdev-11161.Igor Babaev2016-11-111-0/+2
* | | | Fixed bug mdev-11313.Igor Babaev2016-11-261-5/+5
* | | | Fixed bug mdev-11072.Igor Babaev2016-11-151-2/+4
* | | | Fixed bug mdev-10884.mariadb-10.2.2Igor Babaev2016-09-251-11/+15
* | | | Another attempt to fix bug mdev-10785 + cleanup for the previous attempt.Igor Babaev2016-09-141-8/+1
* | | | Fixed bug mdev-10785.Igor Babaev2016-09-141-32/+6
* | | | Fixed bug mdev-10783.Igor Babaev2016-09-131-0/+4
* | | | Another attempt to fix bug mdev-10736.Igor Babaev2016-09-091-5/+1
* | | | Fixed a flaw in the implementation of condition push-downIgor Babaev2016-09-041-8/+52
* | | | Fixed a failure with cte_recursive.test:Igor Babaev2016-09-011-0/+5
* | | | Merge branch '10.2-mdev9197-cons' of github.com:shagalla/serverIgor Babaev2016-08-311-0/+134
|\ \ \ \
| * | | | The consolidated patch for mdev-9197.Galina Shalygina2016-08-231-0/+134
* | | | | Merge 10.2 into 10.2-mdev9864.Igor Babaev2016-08-301-1/+5
|\ \ \ \ \