summaryrefslogtreecommitdiff
path: root/storage/xtradb/include
Commit message (Expand)AuthorAgeFilesLines
* Merge 10.1 into 10.2Marko Mäkelä2018-01-081-1/+5
|\
| * MDEV-14874 innodb_encrypt_log corrupts the log when the LSN crosses 32-bit bo...Marko Mäkelä2018-01-081-1/+5
* | Merge 10.1 into 10.2, with some MDEV-14799 fixupsmariadb-10.2.12Marko Mäkelä2018-01-031-1/+2
|\ \ | |/
| * Merge 10.0 into 10.1Marko Mäkelä2018-01-021-1/+2
| |\
| | * Merge 5.5 into 10.0Marko Mäkelä2018-01-021-1/+2
| | |\
| | | * MDEV-14799 After UPDATE of indexed columns, old values will not be purged fro...Marko Mäkelä2018-01-021-0/+2
* | | | Merge remote-tracking branch 'origin/10.1' into 10.2Vicențiu Ciorbaru2017-12-222-7/+2
|\ \ \ \ | |/ / /
| * | | MDEV-6247 post-fix: Re-enable some debug assertionsMarko Mäkelä2017-12-211-3/+0
| * | | Merge branch '10.0' into 10.1Vicențiu Ciorbaru2017-12-201-4/+2
| |\ \ \ | | |/ /
| | * | Correct a function commentMarko Mäkelä2017-12-201-4/+2
* | | | Merge 10.1 into 10.2Marko Mäkelä2017-12-142-4/+8
|\ \ \ \ | |/ / /
| * | | Merge 10.0 into 10.1Marko Mäkelä2017-12-131-1/+8
| |\ \ \ | | |/ /
| | * | MDEV-12323 Rollback progress log messages during crash recovery are intermixe...Marko Mäkelä2017-12-131-0/+5
| | * | MDEV-12352 InnoDB shutdown should not be blocked by a large transaction rollbackMarko Mäkelä2017-12-131-1/+3
| * | | Merge 10.0 into 10.1Marko Mäkelä2017-12-121-3/+0
| |\ \ \ | | |/ /
| | * | removed garbase struct memberEugene Kosov2017-11-151-3/+0
* | | | Merge remote-tracking branch 'origin/10.1' into 10.2Vladislav Vaintroub2017-11-241-2/+2
|\ \ \ \ | |/ / /
| * | | Fix Windows build with -DPLUGIN_PERFSCHEMA=NOVladislav Vaintroub2017-11-241-2/+2
* | | | Merge 10.1 into 10.2Marko Mäkelä2017-11-074-32/+13
|\ \ \ \ | |/ / /
| * | | MDEV-13328 ALTER TABLE…DISCARD TABLESPACE takes a lot of timeMarko Mäkelä2017-11-064-32/+13
* | | | Merge 10.1 into 10.2Marko Mäkelä2017-10-271-1/+1
|\ \ \ \ | |/ / /
| * | | Merge 10.0 into 10.1Marko Mäkelä2017-10-261-1/+1
| |\ \ \ | | |/ /
| | * | MDEV-12569 InnoDB suggests filing bugs at MySQL bug trackerMarko Mäkelä2017-10-261-1/+1
| | * | Merge branch 'merge-innodb-5.6' into 10.0Vicențiu Ciorbaru2017-10-261-1/+1
| | * | Merge 5.5 into 10.0Marko Mäkelä2017-10-261-1/+1
| | |\ \ | | | |/
| | | * MDEV-12569 InnoDB suggests filing bugs at MySQL bug trackerMarko Mäkelä2017-10-261-1/+1
* | | | Merge branch '10.1' into 10.2Sergei Golubchik2017-10-244-34/+3
|\ \ \ \ | |/ / /
| * | | Merge branch '10.0' into 10.1Sergei Golubchik2017-10-224-34/+3
| |\ \ \ | | |/ /
| | * | Merge branch '5.5' into 10.0Sergei Golubchik2017-10-181-1/+1
| | |\ \ | | | |/
| | | * MDEV-13459 Warnings, when compiling with gcc-7.xSergei Golubchik2017-10-172-2/+2
| | | * Merge remote-tracking branch 'merge/merge-xtradb-5.5' into 5.5Vicențiu Ciorbaru2017-09-191-1/+1
| | | |\
| | | | * 5.5.57-38.9merge-xtradb-5.5Vicențiu Ciorbaru2017-09-191-1/+1
| | | * | Merge branch 'merge-xtradb-5.5' into 5.5mariadb-5.5.57Sergei Golubchik2017-07-1817-77/+69
| | | |\ \ | | | | |/
| | | | * 5.5.55-38.8Sergei Golubchik2017-07-1819-78/+70
| | | | * 5.5.53-38.5Sergei Golubchik2016-12-221-1/+1
| | * | | MDEV-13838: Wrong result after altering a partitioned tableJan Lindström2017-10-102-17/+1
| | * | | MDEV-13446 fts_create_doc_id() unnecessarily allocates 8 bytes for every inse...Marko Mäkelä2017-10-091-16/+1
* | | | | Merge 10.1 into 10.2Marko Mäkelä2017-10-021-0/+2
|\ \ \ \ \ | |/ / / /
| * | | | cleanup: remove useless "inline" keywordsSergei Golubchik2017-09-271-7/+1
| * | | | MDEV-13787 Crash in persistent stats wsrep_on (thd=0x0)Sachin Setiya2017-09-271-0/+8
* | | | | Merge branch '10.1' into 10.2Vicențiu Ciorbaru2017-09-193-3/+15
|\ \ \ \ \ | |/ / / /
| * | | | Merge branch '10.0' into 10.1Vicențiu Ciorbaru2017-09-193-3/+15
| |\ \ \ \ | | |/ / /
| | * | | Revert d9bc5e03d788b958ce8c76e157239953db60adb2 from Oracle (in XtraDB)Vicențiu Ciorbaru2017-09-191-5/+0
| | * | | Merge branch 'merge-xtradb-5.6' into 10.0Vicențiu Ciorbaru2017-09-193-3/+20
| | |\ \ \
| | | * | | 5.6.37-82.2Vicențiu Ciorbaru2017-09-193-3/+20
| | * | | | Windows : fix a warning in popular header fileVladislav Vaintroub2017-09-151-1/+1
* | | | | | Merge 10.1 into 10.2Marko Mäkelä2017-09-176-23/+75
|\ \ \ \ \ \ | |/ / / / /
| * | | | | Clean up after commit 93087d5fe74b0078e0b6db4233710648c79043ccMarko Mäkelä2017-09-161-1/+1
| * | | | | Fix some warningsVladislav Vaintroub2017-09-162-2/+2
| * | | | | MDEV-12634: Uninitialised ROW_MERGE_RESERVE_SIZE bytes written to tem…Jan Lindström2017-09-144-21/+73