summaryrefslogtreecommitdiff
path: root/sql/sql_derived.cc
Commit message (Expand)AuthorAgeFilesLines
* 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.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.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
* | | 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
* | | 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
* | | 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
* | | MDEV-8010 - Avoid sql_alloc() in Items (Patch #1)Sergey Vojtovich2015-08-211-1/+1
* | | Merge tag 'mariadb-10.0.19' into 10.1Sergei Golubchik2015-06-011-1/+4
|\ \ \ | |/ /
| * | Merge branch '5.5' into 10.0Sergei Golubchik2015-05-041-1/+4
| |\ \ | | |/
| | * MDEV-8018: main.multi_update fails with --ps-protocolOleksandr Byelkin2015-04-221-1/+3
* | | MDEV-7943 - pthread_getspecific() takes 0.76% in OLTP ROSergey Vojtovich2015-05-131-1/+1
* | | MDEV-7951 - sql_alloc() takes 0.25% in OLTP ROSergey Vojtovich2015-05-131-1/+1
* | | Merge branch '10.0' into 10.1Sergei Golubchik2015-03-071-0/+3
|\ \ \ | |/ /
| * | Merge branch '5.5' into 10.0Sergei Golubchik2015-02-181-0/+3
| |\ \ | | |/
| | * MDEV-7260: Crash in get_best_combination when executing multi-table UPDATE wi...unknown2015-02-111-0/+3
* | | Merge branch '10.0' into merge-wipSergei Golubchik2015-01-311-4/+14
|\ \ \ | |/ /
| * | MDEV-6668: Server crashes in check_view_single_update on concurrent DDL/DML f...Michael Widenius2015-01-291-4/+14
* | | cleanup: comments referring to non-extistent Item classesSergei Golubchik2014-12-041-1/+1
* | | Merge branch '10.0' into bb-10.1-mergeSergei Golubchik2014-12-021-3/+1
|\ \ \ | |/ /
| * | MDEV-6785 Wrong result on 2nd execution of PS with aggregate function, FROM S...Sergei Golubchik2014-11-181-2/+0
| * | MDEV-5120 Test suite test maria-no-logging failsMichael Widenius2014-09-301-1/+1
* | | Merge branch 'bb-10.1-merge' into 10.1mariadb-10.1.1Sergei Golubchik2014-10-161-5/+3
|\ \ \ | |/ /
| * | crash in main.views (and other view + PS tests)Sergei Golubchik2014-08-071-0/+2
| * | 5.5.39 mergeSergei Golubchik2014-08-071-5/+1
| |\ \ | | |/
| | * MDEV-6441: memory leakunknown2014-07-311-5/+1
* | | MDEV-334: Backport of UNION ALL optimization from mysql-5.7.Igor Babaev2014-10-141-2/+2
|/ /
* | 5.5.38 mergeSergei Golubchik2014-06-061-6/+11
|\ \ | |/
| * 5.3 mergeSergei Golubchik2014-06-021-6/+11
| |\
| | * MDEV-6251: SIGSEGV in query optimizer (in set_check_materialized with MERGE v...unknown2014-06-021-6/+11
| | * 5.2 mergeSergei Golubchik2014-03-161-1/+1
| | |\
| | | * mysql-5.1.73 mergeSergei Golubchik2014-03-151-1/+1
| | | |\
| | | | * Updated/added copyright headers.Murthy Narkedimilli2013-02-251-1/+1
* | | | | 5.5 mergeSergei Golubchik2014-03-261-20/+30
|\ \ \ \ \ | |/ / / /
| * | | | 5.3-mergeSergei Golubchik2014-03-161-20/+30
| |\ \ \ \ | | |/ / /
| | * | | MDEV-5740: Assertion `!derived->first_select()->exclude_from_table_unique_tes...unknown2014-03-071-20/+30
* | | | | merge 10.0-base ->10.0unknown2014-02-051-1/+1
|\ \ \ \ \ | |/ / / /