summaryrefslogtreecommitdiff
path: root/libmysqld
Commit message (Expand)AuthorAgeFilesLines
* Merge 10.4 into 10.5Marko Mäkelä2022-12-131-9/+6
|\
| * Merge 10.3 into 10.4Marko Mäkelä2022-12-131-9/+6
| |\
| | * fix embedded startup with no command line argumentsSergei Golubchik2022-12-021-9/+6
* | | Merge 10.4 into 10.5Marko Mäkelä2022-10-131-2/+10
|\ \ \ | |/ /
| * | Merge 10.3 into 10.4Marko Mäkelä2022-10-131-2/+10
| |\ \ | | |/
| | * Silence clang 13 -Wunused-but-set-variableMarko Mäkelä2022-10-131-2/+10
* | | Merge branch '10.4' into 10.5Oleksandr Byelkin2022-02-011-1/+1
|\ \ \ | |/ /
| * | Merge branch '10.3' into 10.4Oleksandr Byelkin2022-01-301-1/+1
| |\ \ | | |/
| | * Merge branch '10.2' into 10.3mariadb-10.3.33Oleksandr Byelkin2022-01-291-1/+1
| | |\
| | | * Fixed wrong function call in embedded serverMonty2022-01-281-1/+1
| * | | Add new option NOT_EMBEDDED, for pluginsVladislav Vaintroub2021-11-091-2/+2
* | | | fix query cache in embedded, enable MARIADB_CLIENT_EXTENDED_METADATASergei Golubchik2022-01-301-1/+1
* | | | fix query cache in embeddedSergei Golubchik2022-01-302-4/+4
* | | | MDEV-23306 Fix build dependencyVladislav Vaintroub2021-09-281-0/+3
* | | | Merge 10.4 into 10.5Marko Mäkelä2021-09-241-5/+7
|\ \ \ \ | |/ / /
| * | | Fixed max length calculation for embedded serverMonty2021-09-211-5/+7
* | | | followup: rename generated files to have distinct namesSergei Golubchik2021-05-271-3/+3
* | | | Merge branch bb-10.4-release into bb-10.5-releasemariadb-10.5.10Nikita Malyavin2021-05-051-2/+2
|\ \ \ \ | |/ / /
| * | | Merge branch bb-10.3-release into bb-10.4-releaseNikita Malyavin2021-05-051-2/+2
| |\ \ \ | | |/ /
| | * | Fix of ppc64 by Wladmariadb-10.3.29Oleksandr Byelkin2021-05-051-2/+2
* | | | Merge branch 'bb-10.4-release' into bb-10.5-releaseSergei Golubchik2021-02-151-1/+2
|\ \ \ \ | |/ / /
| * | | Merge branch 'bb-10.3-release' into bb-10.4-releaseSergei Golubchik2021-02-121-1/+2
| |\ \ \ | | |/ /
| | * | Merge branch '10.2' into 10.3Sergei Golubchik2021-02-011-1/+2
| | |\ \ | | | |/
| | | * cleanup: fix and generalize handle_manager threadSergei Golubchik2021-01-241-1/+2
| * | | Merge 10.3 into 10.4Marko Mäkelä2020-11-031-1/+2
| |\ \ \ | | |/ /
* | | | Merge branch '10.4' into 10.5Oleksandr Byelkin2020-11-011-1/+2
|\ \ \ \
| * \ \ \ Merge branch '10.3' into 10.4Oleksandr Byelkin2020-10-311-1/+2
| |\ \ \ \ | | |/ / / | |/| / / | | |/ /
| | * | Merge branch '10.2' into 10.3Oleksandr Byelkin2020-10-301-1/+2
| | |\ \ | | | |/
| | | * MDEV-19838: followup, fix for PS & embeddedOleksandr Byelkin2020-10-291-1/+2
* | | | Merge 10.4 into 10.5Marko Mäkelä2020-10-301-1/+1
|\ \ \ \ | |/ / /
| * | | Merge 10.3 into 10.4Marko Mäkelä2020-10-291-1/+1
| |\ \ \ | | |/ /
| | * | cleanup: use predefined CMAKE_DL_LIBSSergei Golubchik2020-10-231-1/+1
* | | | MDEV-19275 Provide SQL service to plugins.Alexey Botchkov2020-08-144-14/+7
* | | | Merge branch '10.4' into 10.5Oleksandr Byelkin2020-08-041-0/+1
|\ \ \ \ | |/ / /
| * | | Merge branch '10.3' into 10.4Oleksandr Byelkin2020-08-031-0/+1
| |\ \ \ | | |/ /
| | * | MDEV-19632 Replication aborts with ER_SLAVE_CONVERSION_FAILED upon CREATE ......Alexander Barkov2020-08-011-0/+1
* | | | Merge remote-tracking branch 'origin/10.4' into 10.5Monty2020-07-031-0/+1
|\ \ \ \ | |/ / /
| * | | Merge remote-tracking branch 'origin/10.3' into 10.4Monty2020-07-031-0/+1
| |\ \ \ | | |/ /
| | * | Fixed errors found by MSANMonty2020-07-021-0/+1
| * | | Merge 10.3 into 10.4Marko Mäkelä2020-07-021-0/+2
| |\ \ \ | | |/ /
| | * | Merge 10.2 into 10.3Marko Mäkelä2020-07-021-0/+2
| | |\ \ | | | |/
| | | * MDEV-20377: Make WITH_MSAN more usableMarko Mäkelä2020-07-011-0/+2
* | | | MDEV-22887 unresolved symbol crc32c_vpmsum on Ubuntu XenialMarko Mäkelä2020-06-151-3/+2
* | | | MDEV-22437 make THR_THD* variable thread_localEugene Kosov2020-05-051-9/+2
* | | | MDEV-20377: Make WITH_MSAN more usableMarko Mäkelä2020-03-281-0/+2
* | | | Added support for replication for S3Monty2020-03-241-116/+0
* | | | MDEV-21303 Make executables MariaDB namedRasmus Johansson2020-03-211-17/+17
* | | | MDEV-21907: InnoDB: Enable -Wconversion on clang and GCCMarko Mäkelä2020-03-121-2/+2
* | | | MDEV-21907: Fix some -Wconversion outside InnoDBMarko Mäkelä2020-03-121-14/+27
* | | | perfschema memory related instrumentation changesSergei Golubchik2020-03-104-26/+24