summaryrefslogtreecommitdiff
path: root/sql/sql_prepare.cc
Commit message (Expand)AuthorAgeFilesLines
* Merge 10.3 into 10.4Marko Mäkelä2021-03-051-0/+16
|\
| * Merge 10.2 into 10.3Marko Mäkelä2021-03-031-0/+16
| |\
| | * MDEV-24860: Incorrect behaviour of SET STATEMENT in case it is executed as a ...Dmitry Shulga2021-02-251-0/+16
* | | Merge branch 'bb-10.3-release' into bb-10.4-releaseSergei Golubchik2021-02-121-0/+11
|\ \ \ | |/ /
| * | Merge branch '10.2' into 10.3Sergei Golubchik2021-02-011-0/+11
| |\ \ | | |/
| | * MDEV-24208 SHOW RELAYLOG EVENTS command is not supported in the prepared sta...Dmitry Shulga2021-01-131-0/+11
* | | Merge 10.3 into 10.4Marko Mäkelä2021-01-111-4/+3
|\ \ \ | |/ /
| * | Merge 10.2 into 10.3 (except MDEV-17556)Marko Mäkelä2021-01-111-4/+3
| |\ \ | | |/
| | * MDEV-19838 fixup: clang -Wunused-const-variableMarko Mäkelä2021-01-081-4/+3
* | | 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 mariadb-10.4.17 into 10.4Marko Mäkelä2020-11-111-4/+17
|\ \ \
| * \ \ Merge branch '10.3' into 10.4mariadb-10.4.17Sergei Golubchik2020-11-101-4/+17
| |\ \ \ | | |/ /
| | * | Merge branch '10.2' into 10.3Sergei Golubchik2020-11-091-4/+17
| | |\ \ | | | |/
| | | * MDEV-19838: followup to make happy following protocol implementations:Oleksandr Byelkin2020-11-051-4/+17
| * | | Merge branch '10.3' into 10.4Oleksandr Byelkin2020-10-311-12/+184
| |\ \ \ | | |/ /
* | | | Merge 10.3 into 10.4Marko Mäkelä2020-11-031-12/+184
|\ \ \ \ | | |/ / | |/| |
| * | | Merge branch '10.2' into 10.3Oleksandr Byelkin2020-10-301-12/+184
| |\ \ \ | | | |/ | | |/|
| | * | MDEV-19838: fix of error messagesOleksandr Byelkin2020-10-291-5/+2
| | * | MDEV-19838 Wrong direxec param data caused crashLawrin Novitsky2020-10-291-12/+187
* | | | MDEV-23872 Crash in galera::TrxHandle::state()Teemu Ollakka2020-11-031-0/+20
| |_|/ |/| |
* | | Merge 10.3 into 10.4Marko Mäkelä2020-10-221-2/+2
|\ \ \ | |/ /
| * | Merge 10.2 into 10.3Marko Mäkelä2020-10-221-2/+2
| |\ \ | | |/
| | * Fix the constants namesOleksandr Byelkin2020-10-151-2/+2
| | * fix c++98 buildNikita Malyavin2020-07-211-2/+2
| | * MDEV-16039 Crash when selecting virtual columns generated using functions wit...Nikita Malyavin2020-07-211-2/+2
* | | MDEV-23311 CEILING() and FLOOR() convert temporal input to numbers, unlike RO...Alexander Barkov2020-07-281-1/+1
* | | Merge 10.3 into 10.4Marko Mäkelä2020-07-021-0/+5
|\ \ \ | |/ /
| * | Merge 10.2 into 10.3Marko Mäkelä2020-07-021-0/+5
| |\ \ | | |/
| | * MDEV-22779: Crash: Prepared Statement ..., part #2.Sergei Petrunia2020-06-141-0/+3
| | * MDEV-22779: Crash: Prepared Statement with a '?' parameter inside a re-used CTESergei Petrunia2020-06-141-0/+2
| | * Merge branch '10.1' into 10.2Sergei Petrunia2020-01-171-1/+1
| | |\
| | | * MDEV-21341: Fix UBSAN failures: Issue SixSergei Petrunia2020-01-141-1/+1
| | | * imporve clang buildEugene Kosov2019-06-251-1/+1
* | | | Merge 10.3 into 10.4Marko Mäkelä2020-01-201-1/+1
|\ \ \ \ | |/ / /
| * | | MDEV-21341: Fix UBSAN failures: Issue Sixbb-10.3-mdev21341-issueSixSergei Petrunia2020-01-121-1/+1
* | | | Merge 10.3 into 10.4Marko Mäkelä2019-11-011-2/+2
|\ \ \ \ | |/ / /
| * | | Remove \n from DBUG_PRINT statementsMichael Widenius2019-10-211-2/+2
* | | | Merge branch '10.3' into 10.4Oleksandr Byelkin2019-05-191-1/+1
|\ \ \ \ | |/ / /
| * | | Merge 10.2 into 10.3Marko Mäkelä2019-05-141-1/+1
| |\ \ \ | | |/ /
| | * | Merge 10.1 into 10.2Marko Mäkelä2019-05-131-1/+1
| | |\ \ | | | |/
| | | * Merge branch '5.5' into 10.1Vicențiu Ciorbaru2019-05-111-1/+1
| | | |\
| | | | * Update FSF AddressVicențiu Ciorbaru2019-05-111-1/+1
* | | | | MDEV-17362: SIGSEGV in JOIN::optimize_inner or Assertion `fixed == 0' failed ...Oleksandr Byelkin2019-04-161-0/+4
* | | | | MDEV-19125 Change Send_field::type from enum_field_types to Type_handler*Alexander Barkov2019-04-021-0/+1
* | | | | Merge 10.3 into 10.4Marko Mäkelä2019-03-201-9/+22
|\ \ \ \ \ | |/ / / /
| * | | | Merge branch '10.2' into 10.3Sergei Golubchik2019-03-171-9/+22
| |\ \ \ \ | | |/ / /
| | * | | post-merge: --ps-protocol fixesSergei Golubchik2019-03-151-0/+1
| | * | | Merge branch '10.1' into 10.2Sergei Golubchik2019-03-151-5/+36
| | |\ \ \ | | | |/ /