summaryrefslogtreecommitdiff
path: root/include
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'merge-perfschema-5.6' into 10.1Oleksandr Byelkin2020-01-1911-36/+112
|\
| * 5.6.47Oleksandr Byelkin2020-01-1911-36/+112
| * 5.6.31Sergei Golubchik2016-06-213-22/+22
* | Merge 5.5 into 10.1mariadb-10.1.43Marko Mäkelä2019-11-061-1/+1
|\ \
| * | MDEV-20971 ASAN heap-use-after-free in list_delete / heap_closeSergei Golubchik2019-11-041-1/+1
* | | fix clang warningsEugene Kosov2019-08-281-1/+1
* | | Merge 5.5 into 10.1Marko Mäkelä2019-08-121-1/+9
|\ \ \ | |/ /
| * | Document TRASH_FILL, TRASH_ALLOC, TRASH_FREEMarko Mäkelä2019-08-121-1/+9
* | | imporve clang buildEugene Kosov2019-06-253-8/+8
* | | Merge branch '5.5' into 10.1Oleksandr Byelkin2019-06-121-0/+1
|\ \ \ | |/ /
| * | MDEV-18479 ComplementIgor Babaev2019-05-281-0/+1
* | | Merge 5.5 into 10.1Marko Mäkelä2019-05-281-0/+8
|\ \ \ | |/ /
| * | MDEV-17799 Add ASAN-poisoned redzones for MEM_ROOTSergei Golubchik2019-05-201-5/+6
| * | MDEV-17799 Add ASAN-poisoned redzones for MEM_ROOT and mem_heap_tEugene Kosov2019-05-201-0/+7
* | | Merge branch '5.5' into 10.1Vicențiu Ciorbaru2019-05-11104-104/+104
|\ \ \ | |/ /
| * | Update FSF AddressVicențiu Ciorbaru2019-05-1183-83/+83
* | | Update FSF addressVicențiu Ciorbaru2019-05-118-8/+8
* | | Merge branch '5.5' into 10.1Vicențiu Ciorbaru2019-05-1120-21/+21
|\ \ \ | |/ /
| * | Follow-up to changing FSF addressVicențiu Ciorbaru2019-05-118-8/+8
| * | Update FSF addressMichal Schorm2019-05-1011-11/+11
* | | cleanup: make TREE copyableSergei Golubchik2019-04-241-1/+1
* | | Revert MDEV-18464 and MDEV-12009Marko Mäkelä2019-03-281-3/+0
* | | MDEV-12009: Allow to force kill user threads/query which are flagged as high ...Jan Lindström2019-03-281-0/+3
* | | cmake: re-enable -Werror in the maintainer modeSergei Golubchik2019-03-271-12/+14
* | | cleanup: miscSergei Golubchik2019-03-121-4/+4
* | | ASAN loves stack, give it someSergei Golubchik2019-03-061-1/+5
* | | MDEV-9519: Data corruption will happen on the Galera cluster size changeJulius Goryavsky2019-02-251-0/+3
* | | Merge 10.1 into 10.1Marko Mäkelä2019-02-023-4/+4
|\ \ \
| * \ \ Merge branch '5.5' into 10.0Oleksandr Byelkin2019-01-282-2/+2
| |\ \ \ | | |/ /
| | * | Crude "auto-load-data-local-infile" modemariadb-5.5.63Sergei Golubchik2019-01-272-2/+2
| * | | Merge branch '5.5' into 10.0Oleksandr Byelkin2019-01-281-2/+2
| |\ \ \ | | |/ /
| | * | Avoid noisy Clang 7 warning about unused variable.Vladislav Vaintroub2019-01-191-2/+2
| | * | MDEV-17248 Improve ASAN memory pool instrumentationEugene Kosov2018-09-211-2/+2
* | | | MDEV-10963 Fragmented BINLOG queryAndrei Elkin2019-01-241-1/+3
* | | | Merge 10.0 into 10.1Marko Mäkelä2018-12-131-1/+1
|\ \ \ \ | |/ / /
| * | | Fix UNICODE issue of dlerrorJiaye Wu2018-12-121-1/+1
* | | | Merge 10.0 into 10.1Marko Mäkelä2018-11-051-2/+2
|\ \ \ \ | |/ / /
| * | | Remove dead code is_thd_killed()Marko Mäkelä2018-11-021-2/+2
* | | | Merge branch '10.0' into 10.1Sergei Golubchik2018-10-302-4/+16
|\ \ \ \ | |/ / /
| * | | MDEV-17358 my_reverse_bits() is incorrect due to UBEugene Kosov2018-10-161-4/+4
| * | | MDEV-12547: InnoDB FULLTEXT index has too strict innodb_ft_result_cache_limit...Thirunarayanan Balathandayuthapani2018-10-161-0/+12
* | | | wsrep: create a macro for the error: labelSergei Golubchik2018-10-241-5/+6
* | | | MDEV-17200 - pthread_detach called for already detached threadsSergey Vojtovich2018-10-051-1/+1
* | | | Merge branch '10.0-galera' into 10.1Sergei Golubchik2018-09-071-0/+5
|\ \ \ \
| * \ \ \ Merge tag 'mariadb-10.0.36' into 10.0-galeraJan Lindström2018-08-022-14/+16
| |\ \ \ \ | | |/ / /
* | | | | fix failures of innodb_plugin tests in --embeddedSergei Golubchik2018-09-042-1/+4
* | | | | MDEV-9627 clang builds fail on i386Sergei Golubchik2018-09-041-1/+1
* | | | | Merge branch '10.0' into 10.1Oleksandr Byelkin2018-07-311-1/+1
|\ \ \ \ \ | | |/ / / | |/| | |
| * | | | Merge 5.5 into 10.0Marko Mäkelä2018-07-301-1/+1
| |\ \ \ \ | | | |/ / | | |/| |
| | * | | Merge remote-tracking branch 'mysql/5.5' into 5.5Oleksandr Byelkin2018-07-291-1/+1
| | |\ \ \