summaryrefslogtreecommitdiff
path: root/storage/xtradb
Commit message (Expand)AuthorAgeFilesLines
* Merge remote-tracking branch 'origin/10.2' into bb-10.2-extAlexander Barkov2017-10-0210-52/+43
|\
| * Merge 10.1 into 10.2Marko Mäkelä2017-10-0210-52/+43
| |\
| | * Merge 10.0 into 10.1Marko Mäkelä2017-10-021-8/+6
| | |\
| | | * Merge 5.5 into 10.0Marko Mäkelä2017-10-021-8/+6
| | | |\
| | | | * MDEV-13980 InnoDB fails to discard record lock when discarding an index pageMarko Mäkelä2017-10-021-5/+5
| | | | * Merge remote-tracking branch 'merge/merge-xtradb-5.5' into 5.5Vicențiu Ciorbaru2017-09-192-2/+2
| | | | |\
| | | | | * 5.5.57-38.9merge-xtradb-5.5Vicențiu Ciorbaru2017-09-192-2/+2
| | | | * | Merge branch 'merge-xtradb-5.5' into 5.5mariadb-5.5.57Sergei Golubchik2017-07-1830-203/+244
| | | | |\ \ | | | | | |/
| | | | | * 5.5.55-38.8Sergei Golubchik2017-07-1835-214/+255
| | | | | * 5.5.53-38.5Sergei Golubchik2016-12-221-1/+1
| | * | | | MDEV-13932: fil0pagecompress.cc fails to compile with lzo 2.10Jan Lindström2017-09-291-2/+10
| | * | | | MDEV-12634: Uninitialised ROW_MERGE_RESERVE_SIZE bytes written to temporary fileJan Lindström2017-09-283-33/+17
| | * | | | cleanup: remove useless "inline" keywordsSergei Golubchik2017-09-272-15/+1
| | * | | | MDEV-13787 Crash in persistent stats wsrep_on (thd=0x0)Sachin Setiya2017-09-275-9/+24
* | | | | | Merge 10.2 into bb-10.2-extMarko Mäkelä2017-09-252-9/+5
|\ \ \ \ \ \ | |/ / / / /
| * | | | | Merge 10.1 into 10.2Marko Mäkelä2017-09-252-9/+5
| |\ \ \ \ \ | | |/ / / /
| | * | | | Merge 10.0 into 10.1Marko Mäkelä2017-09-251-8/+4
| | |\ \ \ \ | | | |/ / /
| | | * | | MDEV-13899 IMPORT TABLESPACE may corrupt ROW_FORMAT=REDUNDANT tablesMarko Mäkelä2017-09-241-8/+4
| | * | | | Merge 10.0 into 10.1Marko Mäkelä2017-09-221-1/+1
| | |\ \ \ \ | | | |/ / /
| | | * | | MDEV-13814 Extra logging when innodb_log_archive=ONMarko Mäkelä2017-09-221-1/+1
* | | | | | Merge 10.2 into bb-10.2-extMarko Mäkelä2017-09-208-30/+97
|\ \ \ \ \ \ | |/ / / / /
| * | | | | Merge branch '10.1' into 10.2Vicențiu Ciorbaru2017-09-198-30/+97
| |\ \ \ \ \ | | |/ / / /
| | * | | | Merge branch '10.0' into 10.1Vicențiu Ciorbaru2017-09-198-30/+97
| | |\ \ \ \ | | | |/ / /
| | | * | | Revert d9bc5e03d788b958ce8c76e157239953db60adb2 from Oracle (in XtraDB)Vicențiu Ciorbaru2017-09-193-33/+5
| | | * | | Revert Bug #25175249 ASSERTION: (TEMPL->IS_VIRTUAL && !FIELD) || (FIELD && F...Vicențiu Ciorbaru2017-09-191-20/+3
| | | * | | Merge branch 'merge-xtradb-5.6' into 10.0Vicențiu Ciorbaru2017-09-198-35/+147
| | | |\ \ \
| | | | * | | 5.6.37-82.2Vicențiu Ciorbaru2017-09-198-55/+179
| | | * | | | Windows : fix a warning in popular header fileVladislav Vaintroub2017-09-151-1/+1
* | | | | | | Merge 10.2 into bb-10.2-extMarko Mäkelä2017-09-1720-277/+464
|\ \ \ \ \ \ \ | |/ / / / / /
| * | | | | | Merge 10.1 into 10.2Marko Mäkelä2017-09-1720-277/+464
| |\ \ \ \ \ \ | | |/ / / / /
| | * | | | | Write proper tests for MDEV-12634: Uninitialised ROW_MERGE_RESERVE_SIZE bytesMarko Mäkelä2017-09-161-4/+0
| | * | | | | Clean up after commit 93087d5fe74b0078e0b6db4233710648c79043ccMarko Mäkelä2017-09-161-1/+1
| | * | | | | Innodb : do not call fflush() in os_get_last_error_low(), if no errorVladislav Vaintroub2017-09-161-2/+1
| | * | | | | MDEV-13821 : mariabackup sometimes could lose ib_logf(FATAL) messages,Vladislav Vaintroub2017-09-161-21/+15
| | * | | | | Fix some warningsVladislav Vaintroub2017-09-163-3/+3
| | * | | | | MDEV-13807 mariabackup --apply-log-only does generate redo log by performing ...Marko Mäkelä2017-09-167-9/+19
| | * | | | | MDEV-12634: Uninitialised ROW_MERGE_RESERVE_SIZE bytes written to tem…Jan Lindström2017-09-1410-237/+425
* | | | | | | Merge 10.2 into bb-10.2-extMarko Mäkelä2017-09-0715-123/+77
|\ \ \ \ \ \ \ | |/ / / / / /
| * | | | | | Merge 10.1 into 10.2Marko Mäkelä2017-09-072-1/+2
| |\ \ \ \ \ \ | | |/ / / / /
| | * | | | | Merge 10.0 into 10.1Marko Mäkelä2017-09-072-1/+2
| | |\ \ \ \ \ | | | |/ / / /
| | | * | | | MDEV-13253 After rebuilding redo logs, InnoDB can leak data from redo log bufferMarko Mäkelä2017-09-071-0/+1
| | | * | | | Follow-up to MDEV-13103: Do not add __attribute__((nonnull))Marko Mäkelä2017-09-071-1/+1
| * | | | | | Merge 10.1 into 10.2Marko Mäkelä2017-09-0614-124/+77
| |\ \ \ \ \ \ | | |/ / / / /
| | * | | | | Merge 10.0 into 10.1Marko Mäkelä2017-09-0614-124/+77
| | |\ \ \ \ \ | | | |/ / / /
| | | * | | | MDEV-13103 Assertion `flags & BUF_PAGE_PRINT_NO_CRASH' failed in buf_page_printMarko Mäkelä2017-09-0612-126/+67
| | | * | | | Fix compiler warningsMarko Mäkelä2017-09-011-0/+5
* | | | | | | Merge 10.2 into bb-10.2-extMarko Mäkelä2017-09-0120-292/+399
|\ \ \ \ \ \ \ | |/ / / / / /
| * | | | | | Merge 10.1 into 10.2Marko Mäkelä2017-08-314-18/+12
| |\ \ \ \ \ \ | | |/ / / / /
| | * | | | | MDEV-13684 InnoDB race condition between fil_crypt_thread and btr_scrub_initMarko Mäkelä2017-08-314-18/+12
| * | | | | | Merge 10.1 into 10.2Marko Mäkelä2017-08-3112-126/+229
| |\ \ \ \ \ \ | | |/ / / / /