summaryrefslogtreecommitdiff
path: root/libmysqld
Commit message (Expand)AuthorAgeFilesLines
* Merge 10.3 into 10.4Marko Mäkelä2020-11-031-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.3 into 10.4Marko Mäkelä2020-10-291-1/+1
|\ \ \ | |/ /
| * | cleanup: use predefined CMAKE_DL_LIBSSergei Golubchik2020-10-231-1/+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.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
* | | Merge branch '10.3' into 10.4Sergei Golubchik2019-09-062-4/+15
|\ \ \ | |/ /
| * | Merge 10.2 (up to commit ef00ac4c86daf3294c46a45358da636763fb0049) into 10.3Alexander Barkov2019-09-041-0/+1
| |\ \ | | |/
| | * MDEV-18156 Assertion `0' failed or `btr_validate_index(index, 0, false)' in r...Alexander Barkov2019-09-031-0/+1
| * | Merge branch '10.2' into 10.3Monty2019-09-031-4/+14
| |\ \ | | |/
| | * embedded client now writes errors to stderr during init_embedded_serverMonty2019-09-011-3/+14
* | | Merge branch '10.3' into 10.4Oleksandr Byelkin2019-05-1913-13/+13
|\ \ \ | |/ /
| * | Merge 10.2 into 10.3Marko Mäkelä2019-05-1413-13/+13
| |\ \ | | |/
| | * Merge 10.1 into 10.2Marko Mäkelä2019-05-1313-13/+13
| | |\
| | | * Merge branch '5.5' into 10.1Vicențiu Ciorbaru2019-05-1111-11/+11
| | | |\
| | | | * Update FSF AddressVicențiu Ciorbaru2019-05-1111-11/+11
* | | | | Merge 10.3 into 10.4Marko Mäkelä2019-05-051-1/+0
|\ \ \ \ \ | |/ / / /
| * | | | Cleanup session tracker redundancySergey Vojtovich2019-05-031-1/+0
* | | | | Just move, no code changes otherwise.Sergey Vojtovich2019-04-251-0/+1
* | | | | MDEV-19125 Change Send_field::type from enum_field_types to Type_handler*Alexander Barkov2019-04-021-1/+1
* | | | | MDEV-18408 Assertion `0' failed in Item::val_native_result / Timestamp_or_zer...Alexander Barkov2019-02-251-93/+139
* | | | | Merge branch '10.4' into bb-10.4-mdev16188bb-10.4-mdev16188Sergei Golubchik2019-02-151-0/+1
|\ \ \ \ \
| * | | | | A cleanup for MDEV-13916 Enforce check constraint on JSON typeAlexander Barkov2019-02-151-0/+1
* | | | | | Merge branch '10.4' into bb-10.4-mdev16188Igor Babaev2019-02-141-1/+3
|\ \ \ \ \ \ | |/ / / / /
| * | | | | Merge branch '10.4' into bb-10.4-mdev17096Igor Babaev2019-02-121-0/+1
| |\ \ \ \ \
| | * | | | | MDEV-6111 Optimizer TraceVarun Gupta2019-02-131-0/+1
| * | | | | | Merge branch '10.4' into bb-10.4-mdev17096Igor Babaev2019-02-064-13/+9
| |\ \ \ \ \ \ | | |/ / / / /
| * | | | | | MDEV-17096 Pushdown of simple derived tables to storage enginesIgor Babaev2019-02-061-1/+2
* | | | | | | Fixed a merge problem: missing reference to rowid_filter.cc in a cmake fileIgor Babaev2019-02-041-0/+1
| |/ / / / / |/| | | | |
* | | | | | Move THD list handling to THD_listSergey Vojtovich2019-01-281-7/+2
* | | | | | Merge 10.3 into 10.4Marko Mäkelä2019-01-241-1/+1
|\ \ \ \ \ \ | | |/ / / / | |/| | | |
| * | | | | Merge 10.2 into 10.3Marko Mäkelä2019-01-241-1/+1
| |\ \ \ \ \ | | | |/ / / | | |/| | |
| | * | | | Merge 10.1 into 10.2Marko Mäkelä2019-01-241-1/+1
| | |\ \ \ \ | | | | |/ / | | | |/| |
| | | * | | Merge 10.0 into 10.1Marko Mäkelä2019-01-241-1/+1
| | | |\ \ \
| | | | * | | MDEV-17868 mysqltest fails to link with system PCRE librariesSergei Golubchik2019-01-241-1/+1
* | | | | | | Added syntax and implementation for BACKUP STAGE'sMonty2018-12-091-1/+1
* | | | | | | MDEV-17740 Extend EXTRACT(x AS DAY*) to understand long time intervalsAlexander Barkov2018-11-171-1/+2
* | | | | | | MDEV-17712 Remove C_TIME_FUZZY_DATES, C_TIME_DATETIME_ONLY, C_TIME_TIME_ONLYAlexander Barkov2018-11-141-3/+3
|/ / / / / /
* | | | | | Merge 10.2 into 10.3Marko Mäkelä2018-11-061-1/+1
|\ \ \ \ \ \ | |/ / / / / | | | | / / | |_|_|/ / |/| | | |
| * | | | Merge 10.1 into 10.2Marko Mäkelä2018-11-061-1/+1
| |\ \ \ \ | | |/ / /
| | * | | Merge branch '10.0' into 10.1Sergei Golubchik2018-10-301-1/+1
| | |\ \ \ | | | |/ /
| | | * | Merge branch '5.5' into 10.0Sergei Golubchik2018-10-271-1/+1
| | | |\ \ | | | | |/
| | | | * Merge branch 'mysql/5.5' into 5.5Sergei Golubchik2018-10-231-1/+1
| | | | |\
| | | | | * Bug #26275510 BUNDLED ZLIB DOESN'T INCLUDE FIXES FOR SOME VULNERABILITIESAditya A2018-07-091-2/+1