summaryrefslogtreecommitdiff
path: root/extra
Commit message (Expand)AuthorAgeFilesLines
* Merge 10.3 into 10.4Marko Mäkelä2022-07-011-13/+6
|\
| * Fix clang-15 -Wdeprecated-non-prototypeMarko Mäkelä2022-07-011-13/+6
* | Merge 10.3 into 10.4Marko Mäkelä2022-06-021-67/+33
|\ \ | |/
| * MDEV-28719: compress_write() leaks data_mutex on errorMarko Mäkelä2022-06-011-12/+11
| * MDEV-28689, MDEV-28690: Incorrect error handling for ctrl_mutexMarko Mäkelä2022-05-301-55/+22
* | Merge branch '10.3' into 10.4Sergei Golubchik2022-05-082-81/+333
|\ \ | |/
| * Merge branch '10.2' into 10.3Oleksandr Byelkin2022-05-032-81/+333
| |\
| | * MDEV-28446 mariabackup prepare fails for incrementals if a new schema is crea...Alexander Barkov2022-05-021-2/+14
| | * MDEV-21037 mariabackup does not detect multi-source replication slaveAlexander Barkov2022-04-251-79/+319
* | | WolfSSL v5.2.0-stableMarko Mäkelä2022-04-212-1/+0
* | | Merge 10.3 into 10.4Marko Mäkelä2022-04-211-1/+1
|\ \ \ | |/ /
| * | MDEV-24317 Data race in LOGGER::init_error_log at sql/log.cc:1443 and in LOGG...Sergei Golubchik2022-04-121-1/+1
* | | MDEV-25975: Merge 10.3 into 10.4Marko Mäkelä2022-04-061-12/+0
|\ \ \ | |/ /
| * | MDEV-25975 innodb_disallow_writes causes shutdown to hangMarko Mäkelä2022-04-061-12/+0
* | | Merge 10.3 into 10.4Marko Mäkelä2022-04-061-22/+22
|\ \ \ | |/ /
| * | Merge 10.2 into 10.3Marko Mäkelä2022-04-061-22/+22
| |\ \ | | |/
| | * MDEV-27835 innochecksum -S crashes for encrypted .ibd tablespaceVlad Lesin2022-03-291-24/+24
* | | Merge 10.3 into 10.4Marko Mäkelä2022-02-257-100/+342
|\ \ \ | |/ /
| * | Merge 10.2 into 10.3Marko Mäkelä2022-02-257-98/+339
| |\ \ | | |/
| | * MDEV-27524: Incorrect binlogs after Galera SST using rsync and mariabackupJulius Goryavsky2022-02-227-89/+330
| | * mariabackup: cosmetic changes (whitespaces and indentation)Julius Goryavsky2022-02-221-9/+9
* | | Merge branch '10.3' into 10.4Oleksandr Byelkin2022-01-301-0/+6
|\ \ \ | |/ /
| * | Merge branch '10.2' into 10.3mariadb-10.3.33Oleksandr Byelkin2022-01-291-3/+3
| |\ \ | | |/
| | * MDEV-27494 Rename .ic files to .inlVladislav Vaintroub2022-01-171-3/+3
| * | Merge branch 10.2 into 10.3Julius Goryavsky2021-12-231-1/+1
| |\ \ | | |/
| | * MDEV-27181 fixup: compatibility with Windows + small correctionsbb-10.2-MDEV-27181-fixJulius Goryavsky2021-12-171-1/+1
* | | MDEV-27373 wolfSSL 5.1.1Vladislav Vaintroub2022-01-252-0/+2
* | | WolfSSL v5.1.1Oleksandr Byelkin2022-01-251-0/+0
* | | Merge 10.3 into 10.4Marko Mäkelä2021-11-292-3/+2
|\ \ \ | |/ /
| * | Merge 10.2 into 10.3Marko Mäkelä2021-11-292-3/+2
| |\ \ | | |/
| | * MDEV-26558 Fix a deadlock due to cyclic dependencebb-10.2-robertryancaicse2021-11-241-1/+1
| | * MDEV-22522 RPM packages have meaningless summary/descriptionbb-10.2-MDEV-22522Alexey Bychko2021-11-231-2/+1
* | | improve build, allow sql library to be built in parallel with builtinsVladislav Vaintroub2021-11-091-2/+4
* | | Revert "improve build, allow sql library to be built in parallel with builtins"Sergei Krivonos2021-11-091-4/+2
* | | improve build, allow sql library to be built in parallel with builtinsVladislav Vaintroub2021-11-091-2/+4
* | | Merge 10.3 into 10.4Marko Mäkelä2021-11-091-0/+8
|\ \ \ | |/ /
| * | Merge 10.2 into 10.3Marko Mäkelä2021-11-091-0/+8
| |\ \ | | |/
| | * MDEV-26561 mariabackup release locksDaniel Black2021-11-091-0/+7
| | * MDEV-26561 Fix a bug due to unreleased lockryancaicse2021-11-091-0/+1
* | | wolfssl v4.8.1-stableOleksandr Byelkin2021-10-281-0/+0
* | | Merge 10.3 into 10.4Marko Mäkelä2021-09-225-322/+7
|\ \ \ | |/ /
| * | Merge 10.2 into 10.3Marko Mäkelä2021-09-225-322/+7
| |\ \ | | |/
| | * MDEV-26574 An improper locking bug due to unreleased lock in the ds_xbstream.ccVladislav Vaintroub2021-09-151-3/+7
| | * MDEV-26573 : A static analyzer warning about ds_archive.ccVladislav Vaintroub2021-09-154-318/+0
* | | Merge remote-tracking branch 'upstream/10.3' into 10.4Vicențiu Ciorbaru2021-09-091-0/+2
|\ \ \ | |/ /
| * | Merge branch '10.2' into 10.3Vicențiu Ciorbaru2021-09-071-0/+2
| |\ \ | | |/
| | * Fix potential null pointer access after the allocation errorVladislav Vaintroub2021-09-011-0/+2
* | | Merge 10.3 into 10.4Marko Mäkelä2021-08-311-1/+1
|\ \ \ | |/ /
| * | Merge 10.2 into 10.3Marko Mäkelä2021-08-311-1/+1
| |\ \ | | |/
| | * typo fixedSergei Golubchik2021-08-261-1/+1