summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* post-merge: -Werror fixes in 10.3Sergei Golubchik2019-03-293-4/+4
* Merge branch '10.2' into 10.3Sergei Golubchik2019-03-2949-252/+640
|\
| * post-merge: -Werror fixes in 10.2Sergei Golubchik2019-03-294-9/+14
| * Merge branch '10.1' into 10.2Sergei Golubchik2019-03-2936-157/+278
| |\
| | * Revert MDEV-18464 and MDEV-12009Marko Mäkelä2019-03-2822-194/+178
| | * MDEV-12009: Allow to force kill user threads/query which are flagged as high ...Jan Lindström2019-03-2810-8/+95
| | * MDEV-18464: Port kill_one_trx fixes from 10.4 to 10.1Jan Lindström2019-03-2812-170/+99
| | * MDEV-18466 Unsafe to log updates on tables referenced by foreign keys with tr...Sergei Golubchik2019-03-273-0/+47
| | * MDEV-7066 No Source RPMs ... (and so no "yum-builddep MariaDB-server" either)Sergei Golubchik2019-03-273-15/+10
| | * MDEV-7066 No Source RPMs ... (and so no "yum-builddep MariaDB-server" either)Sergei Golubchik2019-03-273-2/+43
| | * MDEV-7066 No Source RPMs ... (and so no "yum-builddep MariaDB-server" either)Sergei Golubchik2019-03-271-1/+20
| | * cmake: don't do fake rpm ProvidesSergei Golubchik2019-03-271-30/+6
| | * cmake: fix cpack_source_ignore_filesSergei Golubchik2019-03-271-9/+11
| | * cmake: remove workarounds for cmake bugs #13248 and #12864Sergei Golubchik2019-03-271-3/+0
| | * cmake: re-enable -Werror in the maintainer modeSergei Golubchik2019-03-2725-69/+76
| | * Merge branch '5.5' into 10.1Sergei Golubchik2019-03-273-0/+58
| | |\
| | | * MDEV-14784: Slave crashes in show_status_array upon running a trigger withSujatha Sivakumar2019-03-273-0/+58
| | * | MDEV-19060 : mariabackup continues, despite failing to open a tablespaceVladislav Vaintroub2019-03-271-6/+0
| * | | MDEV-15587 AES test fails, segfaults in EVP_CipherInit_exMarko Mäkelä2019-03-291-2/+3
| * | | MDEV-18080, part#1: MyRocks is slow with log-bin=offSergei Petrunia2019-03-281-11/+23
| * | | MDEV-13895: GTID and Master_Delay causes excessive initial delaySujatha Sivakumar2019-03-283-6/+81
| * | | MDEV-19054 : mysql_upgrade_service now allows MySQL 5.7 to MariaDB 10.2 upgr...Vladislav Vaintroub2019-03-281-1/+1
| * | | MDEV-19051 Avoid unnecessary writing MLOG_INDEX_LOADThirunarayanan Balathandayuthapani2019-03-285-79/+84
| * | | MDEV-18899: Server crashes in Field::set_warning_truncated_wrong_valueVarun Gupta2019-03-285-5/+166
* | | | cleanup: move rbr-only test to rpl_row.testSergei Golubchik2019-03-294-30/+32
* | | | MDEV-16252: MINIMAL binlog_row_image does not work for versioned tablesNikita Malyavin2019-03-293-0/+31
* | | | MDEV-15951 system versioning by trx id doesn't work with partitioningSergei Golubchik2019-03-294-11/+11
* | | | MDEV-15951 system versioning by trx id doesn't work with partitioningNikita Malyavin2019-03-2912-66/+244
* | | | Versioning tests stability improvementAleksey Midenkov2019-03-295-93/+96
* | | | MDEV-15412 For any non-existing transaction ID, AS OF provides the current ta...Aleksey Midenkov2019-03-294-15/+16
* | | | Update 10.3 man pagesIan Gilfillan2019-03-297-7/+7
* | | | MDEV-15658: Assertion failed in lock_rec_other_trx_holds_expl_callbackMarko Mäkelä2019-03-271-1/+15
* | | | Merge 10.2 into 10.3Marko Mäkelä2019-03-2741-427/+483
|\ \ \ \ | |/ / /
| * | | Merge 10.1 into 10.2Marko Mäkelä2019-03-2739-422/+478
| |\ \ \ | | |/ /
| | * | Merge 10.0 into 10.1Marko Mäkelä2019-03-2729-371/+429
| | |\ \
| | | * | MDEV-18417/MDEV-18656/MDEV-18417: Work around compiler ASAN bugMarko Mäkelä2019-03-271-0/+7
| | | * | Merge 5.5 into 10.0bb-10.0-mergeMarko Mäkelä2019-03-2628-371/+423
| | | |\ \ | | | | |/
| | | | * Fixed ps-protocol thread_pool_server_audit failureSergey Vojtovich2019-03-261-0/+2
| | | | * Fix tests in 2020Bernhard M. Wiedemann2019-03-2610-423/+423
| | | | * Fix for MDEV-17449, typo in error message (#1146)Chris Calender2019-03-248-54/+54
| | | | * Fix for MDEV-18276, typo in error message + all other occurrences of referingChris Calender2019-03-233-3/+3
| | | | * MDEV-17119 replicate_rewrite_db does not work for single chardatabase namesachin2019-03-224-2/+41
| | | | * Fix for MDEV-15538, '-N' Produce html output wrongchriscalender2019-03-223-1/+12
* | | | | Merge 10.2 into 10.3Marko Mäkelä2019-03-262-10/+10
|\ \ \ \ \ | |/ / / /
| * | | | Merge 10.1 into 10.2Marko Mäkelä2019-03-262-8/+8
| |\ \ \ \ | | |/ / /
| | * | | Fixup for MDEV-18968Marko Mäkelä2019-03-261-2/+2
* | | | | MDEV-18869 Assertion `!((field)->vcol_info && (field)->stored_in_db())' faile...Aleksey Midenkov2019-03-263-1/+96
* | | | | Merge 10.2 into 10.3Marko Mäkelä2019-03-2620-69/+119
|\ \ \ \ \ | |/ / / /
| * | | | Merge 10.1 into 10.2Marko Mäkelä2019-03-261-1/+3
| |\ \ \ \ | | |/ / /
| | * | | Fix cmake -DENABLED_PROFILING=OFFMarko Mäkelä2019-03-261-1/+3