summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* MDEV-20060: Failing assertion: srv_log_file_size <= 512ULL << 30 while prepar...bb-10.2-MDEV-13416-big-logVlad Lesin2019-08-0610-16/+147
* List of unstable tests for 10.2.26 release (updated)mariadb-10.2.26Elena Stepanova2019-07-271-13/+30
* Merge branch '10.1' into 10.2Oleksandr Byelkin2019-07-2661-50/+385
|\
| * Merge branch '5.5' into 10.1Oleksandr Byelkin2019-07-264-9/+17
| |\
| | * Move the test not suitable for embedded.Oleksandr Byelkin2019-07-264-9/+13
| * | Merge branch 'merge-tokudb-5.6' into 10.1Oleksandr Byelkin2019-07-2654-28/+346
| |\ \
| | * | 5.6.44-86.0Oleksandr Byelkin2019-07-2654-23/+347
| * | | Merge remote-tracking branch 'connect/10.1' into 10.1Oleksandr Byelkin2019-07-269-124/+82
| |\ \ \
| | * \ \ Merge branch 'ob-10.1' into 10.1Olivier Bertrand2019-03-2615-165/+212
| | |\ \ \
| | | * | | Fixed compiler warning in connect engineOlivier Bertrand2019-03-251-1/+1
| | | * | | - Fix MDEV-15793: Server crash in PlugCloseFile with sql_mode=''Olivier Bertrand2019-03-2514-164/+211
| | * | | | Merge branch 'ob-10.1' into 10.1Olivier Bertrand2019-01-275-44/+100
| | |\ \ \ \ | | | |/ / /
| | | * | | - Fix MDEV-18192: CONNECT Engine JDBC not able to issueOlivier Bertrand2019-01-275-44/+100
| | * | | | Merge branch 'ob-10.1' into 10.1Olivier Bertrand2019-01-046-145/+185
| | |\ \ \ \ | | | |/ / /
| | | * | | - Fix a few bug mainly concerning discovery and call from OEMOlivier Bertrand2019-01-036-145/+185
| | * | | | Merge branch 'ob-10.1' into 10.1Olivier Bertrand2018-12-041-1/+1
| | |\ \ \ \ | | | |/ / /
| | | * | | Fix wrong version numberOlivier Bertrand2018-12-041-1/+1
| | * | | | Merge branch 'ob-10.1' into 10.1Olivier Bertrand2018-12-0213-203/+231
| | |\ \ \ \ | | | |/ / /
| | | * | | - Make PlugSubAlloc to be exportableOlivier Bertrand2018-12-0113-203/+231
| | * | | | Merge branch 'ob-10.1' into 10.1Olivier Bertrand2018-10-1116-55/+154
| | |\ \ \ \ | | | |/ / /
| | | * | | - Implement the CHECK TABLE statement and accept REPAIR and ANALYZEOlivier Bertrand2018-10-1116-55/+154
| | * | | | Merge branch 'ob-10.1' into 10.1Olivier Bertrand2018-08-0822-221/+162
| | |\ \ \ \ | | | |/ / /
| | | * | | - Comment out failing Cyrillic test in xml2.testOlivier Bertrand2018-08-082-49/+18
| | | * | | - Fix MDEV-16672 Connect: Warnings with 10.0Olivier Bertrand2018-08-0720-172/+144
| | * | | | Merge branch 'ob-10.1' into 10.1Olivier Bertrand2018-06-282-12/+16
| | |\ \ \ \ | | | |/ / /
| | | * | | - Fix MDEV-16167 Cannot insert unsigned values into a VEC tableOlivier Bertrand2018-06-282-12/+16
| | * | | | Merge branch 'ob-10.1' into 10.1Olivier Bertrand2018-05-0710-45/+33
| | |\ \ \ \ | | | |/ / /
| | | * | | - Fix MDEV-15735 CONNECT [filamtxt.cpp:429]: Suspicious conditionOlivier Bertrand2018-05-0710-45/+33
| | * | | | Merge branch 'ob-10.1' into 10.1Olivier Bertrand2018-03-271-1/+1
| | |\ \ \ \ | | | |/ / /
| | | * | | - Fix MDEV-15577 CONNECT engine JDBC remote index prevents UPDATEOlivier Bertrand2018-03-271-1/+1
| | * | | | Merge branch 'ob-10.1' into 10.1Olivier Bertrand2018-03-1415-171/+383
| | |\ \ \ \ | | | |/ / /
| | | * | | - Fix MDEV-15429 CONNECT engine JDBC handling Postgresql UUID typeOlivier Bertrand2018-03-1415-171/+383
| | * | | | Merge branch 'ob-10.1' into 10.1Olivier Bertrand2018-02-262993-119349/+204879
| | |\ \ \ \ | | | |/ / /
| | | * | | - Remove warning on not used tabtyp variable in connect_assisted_discoveryOlivier Bertrand2018-02-2644-564/+814
| | | * | | Commit merge of new MariaDB versionOlivier Bertrand2018-02-162952-118865/+204082
| | | |\ \ \
| | | * | | | - Make Json_Array_Add to accept a non JSON item as 1st parameterOlivier Bertrand2018-02-163-13/+76
| | * | | | | Merge branch 'ob-10.1' into 10.1Olivier Bertrand2018-02-1414-281/+409
| | |\ \ \ \ \ | | | |/ / / /
| | | * | | | - Fix a bug causing CONNECT to loop when expanding a JSON columnOlivier Bertrand2018-02-1314-281/+409
| | * | | | | Merge branch 'ob-10.1' into 10.1Olivier Bertrand2018-02-021-4/+5
| | |\ \ \ \ \ | | | |/ / / /
| | | * | | | - Remove warning on not used tabtyp variable in connect_assisted_discoveryOlivier Bertrand2018-02-021-4/+5
| | * | | | | Merge branch 'ob-10.1' into 10.1Olivier Bertrand2018-02-0155-812/+849
| | |\ \ \ \ \ | | | |/ / / /
| | | * | | | - Use delayed load for the MongoDB C Drive on WindowsOlivier Bertrand2018-01-3155-812/+849
| | * | | | | Merge branch 'ob-10.1' into 10.1Olivier Bertrand2018-01-043-30/+41
| | |\ \ \ \ \ | | | |/ / / /
| | | * | | | - Fix MDEV-9844, MDEV-10179, MDEV-14214Olivier Bertrand2018-01-043-30/+41
| | * | | | | Merge branch 'ob-10.1' into 10.1Olivier Bertrand2017-11-038-79/+114
| | |\ \ \ \ \ | | | |/ / / /
| | | * | | | - Fix MDEV-13925: Actually this fixes SELECT queries whenOlivier Bertrand2017-11-038-79/+114
| | * | | | | Merge branch 'ob-10.1' into 10.1Olivier Bertrand2017-10-1736-444/+399
| | |\ \ \ \ \ | | | |/ / / /
| | | * | | | - Update version numberOlivier Bertrand2017-10-1736-444/+399
| | * | | | | Merge branch 'ob-10.1' into 10.1Olivier Bertrand2017-10-111-1/+1
| | |\ \ \ \ \ | | | |/ / / /
| | | * | | | Fix MDEV-13924 modified: storage/connect/jdbconn.cppOlivier Bertrand2017-10-111-1/+1