summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* MDEV-21383: Possible range plan is not used under certain conditionsbb-10.3-mdev21383Sergei Petrunia2020-01-244-1/+194
* Merge branch '10.2' into 10.3Oleksandr Byelkin2020-01-21235-771/+2390
|\
| * new version CC 3.1Oleksandr Byelkin2020-01-201-0/+0
| * Merge branch '10.1' into 10.2Oleksandr Byelkin2020-01-20230-720/+2314
| |\
| | * Merge branch 'merge-tokudb-5.6' into 10.1Oleksandr Byelkin2020-01-1927-111/+239
| | |\
| | | * 5.6.46-86.2Oleksandr Byelkin2020-01-1928-112/+249
| | * | Merge branch 'merge-perfschema-5.6' into 10.1Oleksandr Byelkin2020-01-19184-557/+1844
| | |\ \
| | | * | 5.6.47Oleksandr Byelkin2020-01-19187-569/+1866
| | * | | Merge remote-tracking branch 'connect/10.1' into 10.1Oleksandr Byelkin2020-01-1944-1010/+1299
| | |\ \ \
| | | * | | - Update grant tests for new MariaDB version 10.1.44Olivier Bertrand2020-01-1212-324/+415
| | | * | | Merge with last MariaDB versionOlivier Bertrand2020-01-115698-234981/+93243
| | | |\ \ \
| | | * | | | - Fix MDEV-21450Olivier Bertrand2020-01-111-5/+13
| | | * | | | Update to version 1.07 (as for MariaDB 10.2)Olivier Bertrand2020-01-0933-721/+913
| | * | | | | Merge branch '5.5' into 10.1Oleksandr Byelkin2020-01-1911-43/+118
| | |\ \ \ \ \
| | | * | | | | Bug#29630767 - USE OF UNINITIALIZED VALUE IN LIBMYSQL (CLIENT.CC FUNCTION RUN...mariadb-5.5.67Sergei Golubchik2020-01-184-1/+28
| | | * | | | | Bug#30194841 INSERT ON DUPLICATE KEY UPDATE UPDATES THE WRONG ROWMaheedhar PV2020-01-183-0/+80
| | | * | | | | MDEV-21210: main.uniques_crash-7912 tries to allocate 1TB of memoryVicențiu Ciorbaru2020-01-162-37/+0
| | | * | | | | Improve documentation of Unique classVicențiu Ciorbaru2020-01-161-4/+9
| | | * | | | | Use get_ident_len in heartbeat event error messagesMarkus Mäkelä2020-01-131-2/+2
| | * | | | | | InnoDB 5.6.47 and XtraDB 5.6.46-86.2Marko Mäkelä2020-01-175-8/+8
| * | | | | | | Merge remote-tracking branch 'connect/10.2' into 10.2Oleksandr Byelkin2020-01-205-21/+39
| |\ \ \ \ \ \ \
| | * | | | | | | - Fix MDEV-21450Olivier Bertrand2020-01-123-9/+19
| | * | | | | | | Make LIKE_FUNC only for version >= 10.2 in ha_connect.ccOlivier Bertrand2019-12-101-0/+2
| | * | | | | | | Fix reldef.cpp (wrong flag for catalog columns)Olivier Bertrand2019-12-041-6/+4
| | * | | | | | | Fix tabrest.cpp when used for OEMOlivier Bertrand2019-12-031-8/+9
| | * | | | | | | Make restGetFile extern COlivier Bertrand2019-12-033-4/+8
| | * | | | | | | comment out <dlfnc.h> in tabrest.cppcOlivier Bertrand2019-12-011-3/+3
| | * | | | | | | <dlfnc.h> in tabrest.cpp and redef.cppOlivier Bertrand2019-12-012-4/+4
| | * | | | | | | Add include <dlfnc.h> in tabrest.cppOlivier Bertrand2019-11-301-1/+4
| * | | | | | | | MDEV-21532 : galera.galera_rsu_drop_pk MTR failed: Result content mismatchJan Lindström2020-01-203-36/+43
* | | | | | | | | Merge 10.2 into 10.3Marko Mäkelä2020-01-204-22/+21
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / /
| * | | | | | | | Enable tests for --embeddedMarko Mäkelä2020-01-202-6/+0
| * | | | | | | | MDEV-13626: Work around DEBUG_SYNC timeoutsMarko Mäkelä2020-01-202-16/+21
* | | | | | | | | Fix another trivial merge errorSergei Petrunia2020-01-191-2/+2
* | | | | | | | | Merge 10.2 into 10.3Marko Mäkelä2020-01-1836-358/+2729
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / /
| * | | | | | | | Fix a merge typoSergei Petrunia2020-01-171-1/+1
| * | | | | | | | MDEV-21499 Merge new release of InnoDB 5.7.29 to 10.2Marko Mäkelä2020-01-172-4/+10
| |\ \ \ \ \ \ \ \
| | * | | | | | | | Bug #30499288 - GCC 9.2.1 REPORTS A NEW WARNING FOR OS_FILE_GET_PARENT_DIRNikša Skeledžija2020-01-171-2/+8
| |/ / / / / / / /
| * | | | | | | | MDEV-21513: Avoid some crashes in ALTER TABLE...IMPORT TABLESPACEMarko Mäkelä2020-01-171-5/+62
| * | | | | | | | MDEV-21512 InnoDB may hang due to SPATIAL INDEXMarko Mäkelä2020-01-176-138/+87
| * | | | | | | | MDEV-21511: Remove unnecessary codeMarko Mäkelä2020-01-1710-57/+24
| * | | | | | | | MDEV-21511 Wrong estimate of affected BLOB columns in updateMarko Mäkelä2020-01-174-100/+15
| * | | | | | | | MDEV-21509 Possible hang during purge of history, or rollbackMarko Mäkelä2020-01-179-48/+464
| * | | | | | | | MDEV-13626: Add the WL#6326 testsMarko Mäkelä2020-01-175-0/+2038
| * | | | | | | | MDEV-17062 : Test failure on galera.MW-336Jan Lindström2020-01-174-17/+45
* | | | | | | | | Merge branch '10.2' into 10.3Sergei Petrunia2020-01-17219-524/+841
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / /
| * | | | | | | | Merge branch '10.1' into 10.2Sergei Petrunia2020-01-1714-63/+63
| |\ \ \ \ \ \ \ \ | | | |/ / / / / / | | |/| | | | | |
| | * | | | | | | MDEV-21500 Server hang when using simulated AIOMarko Mäkelä2020-01-162-2/+6
| | * | | | | | | MDEV-21341: Fix UBSAN failures, part 8: fix error in compare_fields_by_table_...Sergei Petrunia2020-01-151-4/+8
| | * | | | | | | MDEV-21341: Fix UBSAN failures, part #5Sergei Petrunia2020-01-151-1/+2