summaryrefslogtreecommitdiff
path: root/storage/xtradb/row/row0merge.cc
Commit message (Expand)AuthorAgeFilesLines
* Remove XtraDBMarko Mäkelä2017-06-211-4411/+0
* Merge 10.1 into 10.2Marko Mäkelä2017-05-261-1/+2
|\
| * MDEV-12926 encryption.innodb_onlinealter_encryption, encryption.innodb-bad-ke...Marko Mäkelä2017-05-261-1/+1
| * MDEV-12625 total_index_blocks is uninitialized in ALTER TABLE…ALGORITHM=INP...Marko Mäkelä2017-05-231-0/+1
* | Merge 10.1 into 10.2Marko Mäkelä2017-05-231-12/+24
|\ \ | |/
| * Merge 10.0 into 10.1Marko Mäkelä2017-05-201-12/+24
| |\
| | * Merge branch 'merge-xtradb-5.6' into 10.0Vicențiu Ciorbaru2017-05-171-11/+24
| | |\
| | | * 5.6.36-82.0Vicențiu Ciorbaru2017-05-161-11/+24
* | | | Merge 10.1 into 10.2Marko Mäkelä2017-05-051-4/+8
|\ \ \ \ | |/ / /
| * | | MDEV-12253: Buffer pool blocks are accessed after they have been freedJan Lindström2017-04-261-4/+8
* | | | Merge 10.1 into 10.2Marko Mäkelä2017-04-281-64/+91
|\ \ \ \ | |/ / /
| * | | Merge 10.0 into 10.1Marko Mäkelä2017-04-211-34/+30
| |\ \ \ | | |/ /
| | * | MDEV-12488 Remove type mismatch in InnoDB printf-like callsMarko Mäkelä2017-04-211-35/+31
| * | | MDEV-10509: Remove excessive server error logging on InnoDB ALTER TABLEMarko Mäkelä2017-04-171-30/+61
* | | | Merge branch '10.1' into 10.2Sergei Golubchik2017-03-301-16/+18
|\ \ \ \ | |/ / /
| * | | MDEV-11738: Mariadb uses 100% of several of my 8 cpus doing nothingJan Lindström2017-03-141-4/+14
| * | | Fix InnoDB/XtraDB compilation warnings on 32-bit builds.Marko Mäkelä2017-03-091-4/+2
| * | | Merge 10.0 into 10.1Marko Mäkelä2017-03-091-8/+2
| |\ \ \ | | |/ /
| | * | Merge branch 'merge-xtradb-5.6' into 10.0Vicențiu Ciorbaru2017-03-051-2/+2
| | |\ \ | | | |/
| | | * 5.6.35-80.0Vicențiu Ciorbaru2017-03-041-2/+2
| | * | Merge branch '5.5' into 10.0Vicențiu Ciorbaru2017-03-031-6/+0
* | | | Merge 10.1 to 10.2Marko Mäkelä2017-01-051-4/+3
|\ \ \ \ | |/ / /
| * | | Merge 10.0 into 10.1Marko Mäkelä2017-01-041-4/+3
| |\ \ \ | | |/ /
| | * | MDEV-11694 InnoDB tries to create unused table SYS_ZIP_DICTbb-10.0-mdev-11694Marko Mäkelä2017-01-031-4/+3
* | | | Merge branch '10.1' into 10.2Sergei Golubchik2016-12-291-7/+18
|\ \ \ \ | |/ / /
| * | | MDEV-10368: get_latest_version() called too oftenJan Lindström2016-12-131-4/+1
| * | | MDEV-11349 (1/2) Fix some clang 4.0 warningsMarko Mäkelä2016-11-251-2/+3
| * | | Merge branch '10.0-galera' into 10.1Sergei Golubchik2016-11-021-2/+16
| |\ \ \ | | |/ /
| | * | Merge branch 'merge/merge-xtradb-5.6' into 10.0Sergei Golubchik2016-10-251-2/+16
| | |\ \ | | | |/
| | | * 5.6.33-79.0Sergei Golubchik2016-10-251-2/+16
| * | | Merge branch '10.0' into 10.1Sergei Golubchik2016-09-281-1/+1
| |\ \ \ | | |/ /
| | * | Merge branch 'merge/merge-xtradb-5.6' into 10.0Sergei Golubchik2016-09-271-1/+1
| | |\ \ | | | |/
| | | * 5.6.32-78.1Sergei Golubchik2016-09-271-1/+1
* | | | MDEV-11349 (1/2) Fix some clang 4.0 warningsMarko Mäkelä2016-11-251-2/+3
* | | | Merge branch '10.1' into 10.2Sergei Golubchik2016-09-091-10/+10
|\ \ \ \ | |/ / /
| * | | Merge branch '10.0' into 10.1Sergei Golubchik2016-08-251-10/+10
| |\ \ \ | | |/ /
| | * | Merge branch 'merge/merge-xtradb-5.6' into 10.0Sergei Golubchik2016-08-101-14/+14
| | |\ \ | | | |/
| | | * 5.6.31-77.0Sergei Golubchik2016-08-101-14/+14
* | | | Merge branch '10.1' into 10.2Sergei Golubchik2016-06-301-66/+124
|\ \ \ \ | |/ / /
| * | | Merge branch '10.0' into 10.1Sergei Golubchik2016-06-281-3/+4
| |\ \ \ | | |/ /
| | * | Merge following commit from 5.5:Jan Lindström2016-06-231-1/+1
| | * | Merge branch 'merge-xtradb-5.6' into 0.0Sergei Golubchik2016-06-211-2/+3
| | |\ \ | | | |/
| | | * 5.6.30-76.3Sergei Golubchik2016-06-211-2/+3
| * | | Merge branch '10.0' into 10.1Sergei Golubchik2016-05-041-63/+120
| |\ \ \ | | |/ /
| | * | Merge branch 'merge-xtradb-5.6' into 10.0Sergei Golubchik2016-04-261-63/+119
| | |\ \ | | | |/
| | | * 5.6.29-76.2Sergei Golubchik2016-04-261-63/+119
* | | | Fixed compiler warnings and test failures found by buildbotMonty2016-06-241-7/+7
* | | | General spell fixing in comments and stringsOtto Kekäläinen2016-06-081-2/+2
|/ / /
* | | Merge branch '10.0' into 10.1Sergei Golubchik2016-02-231-76/+81
|\ \ \ | |/ /
| * | Merge branch 'bb-10.0-serg' into 10.0mariadb-10.0.24Sergei Golubchik2016-02-171-33/+18
| |\ \