summaryrefslogtreecommitdiff
path: root/storage/xtradb/handler/ha_innodb.h
Commit message (Expand)AuthorAgeFilesLines
* Remove XtraDBMarko Mäkelä2017-06-211-746/+0
* Merge remote-tracking branch 'origin/10.2' into bb-10.2-extAlexander Barkov2017-06-151-1/+1
|\
| * Merge 10.0 into 10.1Marko Mäkelä2017-05-191-1/+1
| |\
| | * Fix some __attribute__((nonnull)) misuseMarko Mäkelä2017-05-181-1/+1
* | | Changing field::field_name and Item::name to LEX_CSTRINGMonty2017-04-231-1/+1
* | | Added "const" to new data for handler::update_row()Michael Widenius2017-04-181-1/+1
|/ /
* | MDEV-12345 Performance : replace calls to clock() inside trx_start_low() by T...Vladislav Vaintroub2017-03-231-0/+9
* | Merge 10.0 into 10.1Marko Mäkelä2017-03-091-0/+2
|\ \ | |/
| * Merge branch 'merge-xtradb-5.6' into 10.0Vicențiu Ciorbaru2017-03-051-0/+2
| |\
| | * 5.6.35-80.0Vicențiu Ciorbaru2017-03-041-0/+2
* | | Merge 10.0 into 10.1Marko Mäkelä2017-01-041-37/+1
|\ \ \ | |/ /
| * | MDEV-11694 InnoDB tries to create unused table SYS_ZIP_DICTbb-10.0-mdev-11694Marko Mäkelä2017-01-031-37/+1
* | | Merge branch '10.0-galera' into 10.1Sergei Golubchik2016-11-021-0/+37
|\ \ \
| * \ \ Merge tag 'mariadb-10.0.28' into 10.0-galeraNirbhay Choubey2016-10-281-0/+37
| |\ \ \ | | |/ /
| | * | Merge branch 'merge/merge-xtradb-5.6' into 10.0Sergei Golubchik2016-10-251-0/+37
| | |\ \ | | | |/
| | | * 5.6.33-79.0Sergei Golubchik2016-10-251-0/+37
| * | | Merge branch '10.0' into 10.0-galeraNirbhay Choubey2016-08-241-9/+9
| |\ \ \ | | |/ /
| * | | Merge branch '10.0' into 10.0-galeraNirbhay Choubey2016-04-291-0/+37
| |\ \ \
| * \ \ \ bzr merge -rtag:mariadb-10.0.15 maria/10.0Nirbhay Choubey2014-12-051-7/+0
| |\ \ \ \
| * \ \ \ \ bzr merge -rtag:mariadb-10.0.14 maria/10.0/Nirbhay Choubey2014-09-281-1/+0
| |\ \ \ \ \
| * | | | | | Merging InnoDB changes to xtradb (r3783..3808).Nirbhay Choubey2014-03-261-32/+37
| * | | | | | Merge MariaDB-10.0.7 revision 3961.Jan Lindström2014-01-251-94/+335
| |\ \ \ \ \ \
| * \ \ \ \ \ \ merge with MariaDB 5.6 bzr merge lp:maria --rtag:mariadb-10.0.6Seppo Jaakola2013-12-041-2/+2
| |\ \ \ \ \ \ \
| * | | | | | | | Initial merge result with mariaDB 10: lp:mariaSeppo Jaakola2013-07-131-0/+38
* | | | | | | | | Merge branch '10.0' into 10.1Sergei Golubchik2016-08-251-9/+9
|\ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|/ / | |/| | | | | | |
| * | | | | | | | Merge branch 'merge/merge-xtradb-5.6' into 10.0Sergei Golubchik2016-08-101-9/+9
| |\ \ \ \ \ \ \ \ | | |_|_|_|_|_|/ / | |/| | | | | | / | | | |_|_|_|_|/ | | |/| | | | |
| | * | | | | | 5.6.31-77.0Sergei Golubchik2016-08-101-10/+10
* | | | | | | | Merge branch '10.0' into 10.1Sergei Golubchik2016-05-041-1/+37
|\ \ \ \ \ \ \ \ | |/ / / / / / /
| * | | | | | | Merge branch 'merge-xtradb-5.6' into 10.0Sergei Golubchik2016-04-261-0/+23
| |\ \ \ \ \ \ \ | | |/ / / / / /
| | * | | | | | 5.6.29-76.2Sergei Golubchik2016-04-261-0/+23
| | * | | | | | move to storage/xtradbSergei Golubchik2015-05-041-0/+644
| | / / / / /
| * | | | | | MDEV-9918: [ERROR] mysqld got signal 11 during ALTER TABLE `name` COLUMN ADDJan Lindström2016-04-221-0/+14
| | |_|_|_|/ | |/| | | |
* | | | | | MDEV-8406: Test failure on encryption.innodb-page_encryption_log_encryption i...Jan Lindström2015-07-011-12/+12
* | | | | | InnoDB/XtraDB Encryption cleanupJan Lindström2015-04-071-1/+1
* | | | | | InnoDB/XtraDB Encryption cleanupJan Lindström2015-04-071-3/+2
* | | | | | Push for testing of encryptionMonty2015-02-101-1/+4
* | | | | | Merge branch '10.0' into bb-10.1-mergeSergei Golubchik2014-12-021-7/+0
|\ \ \ \ \ \ | |/ / / / /
| * | | | | XtraDB 5.6.21-70.0Sergei Golubchik2014-11-201-7/+0
| | |_|_|/ | |/| | |
* | | | | Merge 10.0.14 into 10.1Sergei Golubchik2014-10-151-1/+0
|\ \ \ \ \ | |/ / / /
| * | | | XtraDB 5.6.20-68.0Sergei Golubchik2014-09-111-1/+0
| | |_|/ | |/| |
* | | | fixing embedded: WaaS. Wsrep as a Service.Sergei Golubchik2014-10-011-15/+0
* | | | MDEV-6247: Merge 10.0-galera to 10.1.Jan Lindström2014-08-271-0/+41
|\ \ \ \
| * | | | MDEV-6247: Merge 10.0-galera to 10.1.Jan Lindström2014-08-261-0/+41
* | | | | MDEV-5834: Merge Kakao Defragmentation implementation to MariaDB 10.1Jan Lindström2014-08-061-1/+6
|/ / / /
* | | | Fixed merge error on InnoDB page compression level handling.Jan Lindström2014-02-031-0/+18
|/ / /
* | | Percona-Server-5.6.14-rel62.0 mergeSergei Golubchik2013-12-221-67/+310
| |/ |/|
* | 5.5 merge and fixes for compiler/test errorsSergei Golubchik2013-09-181-2/+2
|\ \ | |/ |/|
| * Percona-Server-5.5.33-rel31.1.tar.gzSergei Golubchik2013-09-071-2/+2
* | * move bas_ext from the handler to the handlertonSergei Golubchik2013-04-071-1/+0
* | 5.5 mergeSergei Golubchik2013-03-271-4/+5
|\ \ | |/