summaryrefslogtreecommitdiff
path: root/storage/innobase/row/row0merge.cc
Commit message (Expand)AuthorAgeFilesLines
* Assert that DB_TRX_ID must be set on delete-marked recordsMarko Mäkelä2017-07-011-3/+13
* Remove dict_index_t::is_ngramMarko Mäkelä2017-05-261-1/+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-26/+34
|\ \ | |/
| * Merge 10.0 into 10.1Marko Mäkelä2017-05-201-12/+24
| |\
| | * Merge branch 'merge-innodb-5.6' into bb-10.0-vicentiuVicențiu Ciorbaru2017-05-171-11/+24
| | |\
| | | * 5.6.36Vicențiu Ciorbaru2017-05-151-11/+24
* | | | Remove bogus __attribute__((nonnull))Marko Mäkelä2017-05-191-3/+4
* | | | Fix some integer type mismatch.Marko Mäkelä2017-05-101-1/+1
* | | | Merge 10.1 into 10.2Marko Mäkelä2017-05-051-4/+7
|\ \ \ \ | |/ / /
| * | | 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-31/+61
|\ \ \ \ | |/ / /
| * | | 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-34/+31
| * | | MDEV-10509: Remove excessive server error logging on InnoDB ALTER TABLEMarko Mäkelä2017-04-171-29/+61
* | | | Fix Bug#24605956 SERVER MAY CRASH DUE TO A GLIBC BUG IN HANDLING SHORT-LIVED ...Vasil Dimov2017-04-261-0/+7
* | | | Merge branch '10.1' into 10.2Sergei Golubchik2017-03-301-20/+20
|\ \ \ \ | |/ / /
| * | | 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-6/+0
| |\ \ \ | | |/ /
| | * | Merge branch '5.5' into 10.0Vicențiu Ciorbaru2017-03-031-6/+0
| * | | Merge branch '10.0' into 10.1Vicențiu Ciorbaru2017-01-161-0/+7
| |\ \ \ | | |/ /
| | * | Merge remote-tracking branch 'merge/merge-innodb-5.6' into 10.0vicentiu2017-01-101-0/+7
| | |\ \ | | | |/
| | | * 5.6.35vicentiu2017-01-071-0/+7
* | | | Fix many -Wconversion warnings.Marko Mäkelä2017-03-071-2/+2
* | | | MDEV-12072 Do not unnecessarily construct rec_printer objectsMarko Mäkelä2017-02-161-55/+33
* | | | MDEV-11849: Fix storage/innobase/* compile warningsJan Lindström2017-01-261-15/+15
* | | | Remove MYSQL_COMPRESSION.Marko Mäkelä2017-01-181-5/+0
* | | | Merge branch '10.1' into 10.2Sergei Golubchik2016-12-291-4/+1
|\ \ \ \ | |/ / /
| * | | 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' into 10.1Sergei Golubchik2016-08-251-1/+1
| |\ \ \ | | |/ /
| | * | Merge branch 'merge/merge-innodb-5.6' into 10.0Sergei Golubchik2016-08-101-1/+1
| | |\ \ | | | |/
| | | * 5.6.32Sergei Golubchik2016-08-101-1/+1
* | | | MDEV-5800 InnoDB support for indexed vcolsSergei Golubchik2016-12-121-5/+0
* | | | cleanup: InnoDB, remove index_field_t::col_nameSergei Golubchik2016-12-121-3/+1
* | | | cleanup: InnoDB, various minor issuesSergei Golubchik2016-12-121-5/+0
* | | | MDEV-11349 (1/2) Fix some clang 4.0 warningsMarko Mäkelä2016-11-251-2/+3
* | | | MDEV-11296 - InnoDB stalls under OLTP RW on P8Sergey Vojtovich2016-11-251-2/+1
* | | | After merge and bug fixesMonty2016-10-051-1/+1
* | | | Fix crash on innodb_fts.innobase_drop_fts_index_tableJan Lindström2016-09-141-1/+1
* | | | Merge InnoDB 5.7 from mysql-5.7.14.Jan Lindström2016-09-081-133/+119
* | | | Merge InnoDB 5.7 from mysql-5.7.9.Jan Lindström2016-09-021-760/+1561
* | | | Merge branch '10.1' into 10.2Sergei Golubchik2016-06-301-13/+24
|\ \ \ \ | |/ / /
| * | | Merge branch '10.0' into 10.1Sergei Golubchik2016-06-281-11/+21
| |\ \ \ | | |/ /
| | * | Merge following commit from 5.5:Jan Lindström2016-06-231-1/+1
| | * | Merge branch 'bb-10.0-serg' into 10.0Sergei Golubchik2016-06-211-14/+14
| | |\ \
| | | * \ Merge branch 'merge-innodb-5.6' into 10.0Sergei Golubchik2016-06-211-14/+14
| | | |\ \ | | | | |/