summaryrefslogtreecommitdiff
path: root/sql/sql_base.cc
Commit message (Expand)AuthorAgeFilesLines
* Merge branch '10.4' into 10.5Oleksandr Byelkin2021-07-311-1/+1
|\
| * Merge branch '10.3' into 10.4Oleksandr Byelkin2021-07-311-1/+1
| |\
| | * Merge branch '10.2' into 10.3Sergei Golubchik2021-07-211-1/+1
| | |\
| | | * MDEV-23597 Assertion `marked_for_read()' failed while evaluating DEFAULTNikita Malyavin2021-07-161-0/+12
| | | * [1/2] MDEV-18166 ASSERT_COLUMN_MARKED_FOR_READ failed on tables with vcolsNikita Malyavin2021-07-121-1/+1
* | | | MDEV-23178: Qualified asterisk not supported in INSERT .. RETURNINGRucha Deodhar2021-07-221-5/+5
* | | | Removing the condition in the for loop and putting it in one place toRucha Deodhar2021-07-221-6/+8
* | | | Merge 10.4 into 10.5Marko Mäkelä2021-06-011-0/+25
|\ \ \ \ | |/ / /
| * | | Merge 10.3 into 10.4Marko Mäkelä2021-06-011-0/+25
| |\ \ \ | | |/ /
| | * | Merge 10.2 into 10.3Marko Mäkelä2021-06-011-0/+17
| | |\ \ | | | |/
| | | * MDEV-25576: The statement EXPLAIN running as regular statement and as prepare...Dmitry Shulga2021-05-301-0/+17
| | * | MDEV-17749 Kill during LOCK TABLE ; ALTER TABLE causes assertMonty2021-05-261-0/+10
| | * | Merge 10.2 into 10.3Marko Mäkelä2021-05-241-29/+4
| | |\ \ | | | |/
| | | * MDEV-23886 Reusing CTE inside a function fails with table doesn't existIgor Babaev2021-05-211-29/+4
| * | | MDEV-23886 Reusing CTE inside a function fails with table doesn't existIgor Babaev2021-05-251-29/+4
* | | | MDEV-23886 Reusing CTE inside a function fails with table doesn't existbb-10.5-igorIgor Babaev2021-05-251-29/+4
* | | | Merge 10.4 into 10.5Marko Mäkelä2021-05-101-3/+12
|\ \ \ \ | |/ / /
| * | | Merge 10.3 into 10.4Marko Mäkelä2021-05-101-3/+12
| |\ \ \ | | |/ /
| | * | Merge 10.2 into 10.3Marko Mäkelä2021-05-101-7/+13
| | |\ \ | | | |/
| | | * XA PREPARE and SHOW STATUSSergei Golubchik2021-05-081-7/+13
| | | * MDEV-21603 Crashing SHOW TABLES with derived table in WHERE conditionSergei Golubchik2021-05-041-1/+0
* | | | Merge branch bb-10.4-release into bb-10.5-releasemariadb-10.5.10Nikita Malyavin2021-05-051-2/+1
|\ \ \ \ | |/ / /
| * | | Merge branch bb-10.3-release into bb-10.4-releaseNikita Malyavin2021-05-051-2/+1
| |\ \ \ | | |/ /
| | * | Merge branch '10.2' into 10.3Oleksandr Byelkin2021-05-041-2/+1
| | |\ \
| | | * | MDEV-21603 Crashing SHOW TABLES with derived table in WHERE conditionmariadb-10.2.38Sergei Golubchik2021-05-041-1/+0
| | | |/
| | | * MDEV-24823 Crash with invalid multi-table update of view in 2nd execution of SPIgor Babaev2021-04-221-1/+2
* | | | Merge 10.4 into 10.5Marko Mäkelä2021-04-251-1/+2
|\ \ \ \ | |/ / /
| * | | Merge 10.3 into 10.4bb-10.4-mergeMarko Mäkelä2021-04-251-1/+2
| |\ \ \ | | |/ /
| | * | MDEV-24823 Crash with invalid multi-table update of view in 2nd execution of SPIgor Babaev2021-04-221-1/+2
* | | | Merge 10.4 into 10.5Marko Mäkelä2021-04-211-5/+9
|\ \ \ \ | |/ / /
| * | | Fix all warnings given by UBSANMonty2021-04-201-5/+9
* | | | Merge 10.4 into 10.5Marko Mäkelä2021-04-141-1/+1
|\ \ \ \ | |/ / /
| * | | Merge 10.3 into 10.4Marko Mäkelä2021-04-141-1/+1
| |\ \ \ | | |/ /
| | * | Merge 10.2 into 10.3Marko Mäkelä2021-04-131-1/+1
| | |\ \ | | | |/
| | | * MDEV-25108: Running of the EXPLAIN EXTENDED statement produces extra warning ...bb-10.2-MDEV-25108-2Dmitry Shulga2021-04-121-1/+1
* | | | Merge 10.4 into 10.5Marko Mäkelä2021-01-111-45/+77
|\ \ \ \ | |/ / /
| * | | Merge 10.3 into 10.4Marko Mäkelä2021-01-111-45/+77
| |\ \ \ | | |/ /
| | * | Merge 10.2 into 10.3 (except MDEV-17556)Marko Mäkelä2021-01-111-45/+77
| | |\ \ | | | |/
| | | * MDEV-23033: All slaves crash once in ~24 hours and loop restart with signal 11Sujatha2021-01-041-44/+74
* | | | Merge commit '10.4' into 10.5Oleksandr Byelkin2021-01-061-24/+12
|\ \ \ \ | |/ / /
| * | | Merge branch '10.3' into 10.4bb-10.4-MDEV-23468Oleksandr Byelkin2020-12-251-24/+12
| |\ \ \ | | |/ /
| | * | Merge branch '10.2' into 10.3Oleksandr Byelkin2020-12-231-24/+12
| | |\ \ | | | |/
| | | * MDEV-24019 Assertion is hit for query using recursive CTE with no default DBIgor Babaev2020-12-081-24/+11
| | | * MDEV-24314 Unexpected error message when selecting from view that usesIgor Babaev2020-12-041-0/+1
* | | | Merge 10.4 into 10.5Marko Mäkelä2020-12-021-1/+4
|\ \ \ \ | |/ / /
| * | | Merge 10.3 into 10.4Marko Mäkelä2020-12-011-1/+1
| |\ \ \ | | |/ /
| | * | Merge 10.2 into 10.3Marko Mäkelä2020-12-011-1/+1
| | |\ \ | | | |/
| | | * MDEV 15532 Assertion `!log->same_pk' failed in row_log_table_apply_deleteMonty2020-11-301-1/+1
| * | | Merge 10.3 into 10.4Marko Mäkelä2020-11-031-1/+1
| |\ \ \ | | |/ /
* | | | Merge branch '10.4' into 10.5Oleksandr Byelkin2020-11-011-1/+1
|\ \ \ \