summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* bump the VERSIONDaniel Bartholomew2019-05-141-1/+1
* Merge branch 'bb-10.3-release' into 10.3Oleksandr Byelkin2019-05-141-112/+141
|\
| * Updated list of unstable tests for 10.3.15 releasemariadb-10.3.15Elena Stepanova2019-05-131-112/+141
* | Fix typo THRASH_FREED_MEMORY->TRASH_FREED_MEMORYVladislav Vaintroub2019-05-131-7/+7
* | MDEV-19452 - fix incorrect push_warning_printfVladislav Vaintroub2019-05-131-5/+8
* | Make TRASH_FREED_MEMORY a cmake option, similar to SAFEMALLOCVladislav Vaintroub2019-05-132-1/+11
|/
* After-merge fix: Correct a copyright statementMarko Mäkelä2019-05-131-1/+1
* Merge branch '10.2' into 10.3Oleksandr Byelkin2019-05-12255-1185/+3974
|\
| * MDEV-17540 Server crashes in row_purge after TRUNCATE TABLEMarko Mäkelä2019-05-103-0/+60
| * Merge 10.1 into 10.2Marko Mäkelä2019-05-1041-986/+851
| |\
| | * MDEV-13893 encryption.innodb-redo-badkey failed in buildbot with page cannot ...Thirunarayanan Balathandayuthapani2019-05-102-16/+2
| | * MDEV-18220: race condition in fts_get_table_name()Marko Mäkelä2019-05-108-34/+66
| | * MDEV-18220: Backport some code from MariaDB 10.2Marko Mäkelä2019-05-1014-536/+612
| | * MDEV-18220: heap-use-after-free in fts_get_table_name_prefix()Marko Mäkelä2019-05-1016-74/+28
| | * MDEV-18220: Remove some redundant data structuresMarko Mäkelä2019-05-106-326/+270
| | * MDEV-19399 do not call slow my_timer_init() several timesEugene Kosov2019-05-108-56/+54
| | * MDEV-19427 mysql_upgrade_service throws exception upgrading from 10.0 to 10.3Vladislav Vaintroub2019-05-091-1/+2
| | * Removed dead codeSergey Vojtovich2019-05-091-57/+0
| | * MDEV-16060 - InnoDB: Failing assertion: ut_strcmp(index->name, key->name)Sergey Vojtovich2019-05-095-46/+109
| * | bump the VERSIONDaniel Bartholomew2019-05-091-1/+1
| * | Appveyor configuration and addition of badgeRasmus Johansson2019-05-092-2/+8
| * | Merge 10.1 into 10.2Jan Lindström2019-05-089-60/+107
| |\ \ | | |/
| | * bump the VERSIONDaniel Bartholomew2019-05-081-1/+1
| | * Null merge mariadb-10.1.40 into 10.1Marko Mäkelä2019-05-080-0/+0
| | |\
| | | * bump the VERSIONmariadb-10.1.40Daniel Bartholomew2019-05-071-1/+1
| | | * MDEV-17640 UMASK_DIR configuration for mysql_install_db is not applied to mys...Sergei Golubchik2019-05-071-0/+3
| | * | MDEV-19387 innodb_ft_result_cache_limit_32 fails on s390xThirunarayanan Balathandayuthapani2019-05-085-17/+12
| | * | MDEV-19405: Galera test failure on galera_parallel_autoinc_largetrxbb-10.1-MDEV-19405Jan Lindström2019-05-074-49/+98
| * | | edit MariaDB license info so that GitHub recognizes itAndrea Kao2019-05-083-5/+5
| * | | MDEV-19139: pushdown condition with Item_func_set_user_varGalina Shalygina2019-05-083-0/+64
| * | | MDEV-19408 Assertion on trx->state failed in ReadView::copy_trx_idsmariadb-10.2.24Marko Mäkelä2019-05-081-2/+11
| * | | Updated list of unstable tests for 10.2.24Elena Stepanova2019-05-081-99/+149
| * | | MDEV-13942 InnoDB SPATIAL INDEX corruption during root page splitqingda20192019-05-071-1/+8
| * | | Let us close library and only then free defaults.Oleksandr Byelkin2019-05-061-1/+1
| * | | changes in innodb has influence on this test in rocksdb test suiteOleksandr Byelkin2019-05-061-3/+3
| * | | Merge branch '10.1' into 10.2Oleksandr Byelkin2019-05-067-40/+61
| |\ \ \ | | |/ /
| | * | Revert "MDEV-19399 do not call slow my_timer_init() several times"Marko Mäkelä2019-05-065-49/+55
| | * | MDEV-17640 UMASK_DIR configuration for mysql_install_db is not applied to mys...Sergei Golubchik2019-05-061-0/+3
| | * | MDEV-18214 remove some duplicated MONITOR countersEugene Kosov2019-05-065-51/+53
| | * | MDEV-19399 do not call slow my_timer_init() several timesEugene Kosov2019-05-065-55/+49
| | * | MDEV-17883: CREATE TABLE IF NOT EXISTS locking changes in 10.3.10Jan Lindström2019-05-031-4/+5
| * | | fix of resultsOleksandr Byelkin2019-05-051-49/+49
| * | | Merge remote-tracking branch 'connect/10.2' into 10.2Oleksandr Byelkin2019-05-052-52/+49
| |\ \ \
| | * | | Fixed compiler warning in connect engineOlivier Bertrand2019-03-251-1/+1
| | * | | TypoOlivier Bertrand2019-03-241-5/+7
| | * | | - Fix MDEV-15793: Server crash in PlugCloseFile with sql_mode=''Olivier Bertrand2019-03-234-84/+78
| | * | | - Fix MDEV-18292: CONNECT Engine JDBC not able to issueOlivier Bertrand2019-03-033-46/+44
| | * | | Fix xml result by setting eol as lf modified: storage/connect/mysql-test/con...Olivier Bertrand2019-02-091-393/+393
| | * | | Fix xml result mismatch modified: storage/connect/mysql-test/connect/r/xml.re...Olivier Bertrand2019-02-091-344/+344
| | * | | - Fix GetTableName that returned wrong value under WindowsOlivier Bertrand2019-02-091-1/+1