summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Fixed the wsrep SST failures introduced due to merge from other branches10.4-MDEV-23580-addendumJulius Goryavsky2021-05-171-2/+2
* MDEV-23580 post-fix: fixed minor inaccuracy of automatic merge (from 10.3 to ...Julius Goryavsky2021-05-153-4/+2
* bump the VERSIONDaniel Bartholomew2021-05-101-1/+1
* Merge 10.3 into 10.4Marko Mäkelä2021-05-1034-814/+2360
|\
| * Merge 10.2 into 10.3Marko Mäkelä2021-05-1031-832/+2355
| |\
| | * MDEV-25232 Ninja MSVC build sets default CMAKE_BUILD_TYPE to DebugVladislav Vaintroub2021-05-091-11/+12
| | * force jemalloc to be used in release rpm/deb buildsSergei Golubchik2021-05-081-0/+2
| | * XA PREPARE and SHOW STATUSSergei Golubchik2021-05-083-7/+57
| | * mtr --gdb='commands' and restartsSergei Golubchik2021-05-081-1/+1
| | * fix mtr --client-gdb to workSergei Golubchik2021-05-081-1/+1
| | * Revert "Connect: remove Mongo dependencies"Sergei Golubchik2021-05-082-3/+14
| | * Skip auth_named_pipe test, if plugin was not builtVladislav Vaintroub2021-05-071-0/+5
| | * Fix clang++-11 -Wsometimes-uninitializedMarko Mäkelä2021-05-071-1/+1
| | * Merge branch 'bb-10.2-release' into 10.2Oleksandr Byelkin2021-05-074-10/+0
| | |\
| | * | MDEV-25418: Improve mariabackup SST script compliance with native MariaDB SSL...Alexey Yurchenko2021-05-066-46/+106
| | * | MDEV-25418 rsync SST does not work with stunnel encryptionAlexey Yurchenko2021-05-066-0/+888
| | * | MDEV-24962 addendum: improved handling of paths with spacesJulius Goryavsky2021-05-062-14/+16
| | * | MDEV-24962 addendum: mariabackup does not understand --log-bin-index and --lo...Julius Goryavsky2021-05-061-3/+13
| | * | MDEV-21603 Crashing SHOW TABLES with derived table in WHERE conditionSergei Golubchik2021-05-047-23/+67
| | * | MDEV-24962: Galera SST innobackupex-move ignores Environment settingsJulius Goryavsky2021-05-0415-846/+1376
| | * | wsrep sst scripts: removing extra blank lines and spacesJulius Goryavsky2021-05-036-377/+329
| * | | Merge branch 'bb-10.3-release' into 10.3Oleksandr Byelkin2021-05-0796-491/+1763
| |\ \ \
| * | | | MDEV-25597: Disable rpl_semi_sync_slave_compressed_protocol.testSujatha2021-05-051-0/+1
* | | | | Merge branch 'bb-10.4-release' into 10.4Oleksandr Byelkin2021-05-07114-532/+2005
|\ \ \ \ \
| * | | | | remove the test for MDEV-16962mariadb-10.4.19Nikita Malyavin2021-05-052-75/+0
| * | | | | MDEV-23542 Server crashes in thd_clear_errors()Oleksandr Byelkin2021-05-051-12/+4
| * | | | | fix galera_password.result for 10.4Nikita Malyavin2021-05-051-0/+5
| * | | | | Merge branch bb-10.3-release into bb-10.4-releaseNikita Malyavin2021-05-05114-520/+2071
| |\ \ \ \ \ | | | |/ / / | | |/| | |
| | * | | | Fix of ppc64 by Wladmariadb-10.3.29Oleksandr Byelkin2021-05-052-3/+3
| | * | | | Merge branch '10.2' into 10.3Oleksandr Byelkin2021-05-047-22/+67
| | |\ \ \ \ | | | | |_|/ | | | |/| |
| | | * | | MDEV-21603 Crashing SHOW TABLES with derived table in WHERE conditionmariadb-10.2.38Sergei Golubchik2021-05-047-23/+67
| | * | | | Merge branch bb-10.2-release into bb-10.3-releaseNikita Malyavin2021-05-0488-466/+1693
| | |\ \ \ \ | | | |/ / / | | | | / / | | | |/ / | | |/| |
| | | * | Connect: remove Mongo dependenciesNikita Malyavin2021-05-033-10/+0
| | | * | new CCOleksandr Byelkin2021-05-031-0/+0
| | | |/
| | | * MDEV-10674: main.show_explain failed in buildbotSergei Petrunia2021-05-032-1/+9
| | | * MDEV-25584 Implement posix semantics file deletion for Windows 10Vladislav Vaintroub2021-05-031-6/+27
| | | * MDEV-16146: MariaDB slave stops with following errors.Sujatha2021-04-305-10/+112
| | | * MDEV-25536 InnoDB: Failing assertion: sym_node->table != NULL in pars_retriev...st-10.2-thiruThirunarayanan Balathandayuthapani2021-04-301-0/+1
| | | * MDEV-25536 InnoDB: Failing assertion: sym_node->table != NULL in pars_retriev...Thirunarayanan Balathandayuthapani2021-04-303-1/+22
| | | * MDEV-25568 RENAME TABLE causes "Ignoring data file" messagesMarko Mäkelä2021-04-303-15/+4
| | | * Revert "update CC"Nikita Malyavin2021-04-301-0/+0
| | | * update CCNikita Malyavin2021-04-291-0/+0
| | | * Merge remote-tracking branch 'connect/10.2' into 10.2Nikita Malyavin2021-04-2921-296/+512
| | | |\
| | | | * Typo modified: CMakeLists.txtOlivier Bertrand2021-04-091-1/+1
| | | | * Remove add_jar modified: CMakeLists.txtOlivier Bertrand2021-04-091-2/+1
| | | | * Fix add_jar modified: CMakeLists.txtOlivier Bertrand2021-04-091-0/+2
| | | | * Fix install modified: CMakeLists.txtOlivier Bertrand2021-04-091-3/+5
| | | | * typo tabrest.cppOlivier Bertrand2021-04-081-1/+1
| | | | * tabrest.cppOlivier Bertrand2021-04-081-63/+8
| | | | * tabrest.cppOlivier Bertrand2021-04-081-1/+4