summaryrefslogtreecommitdiff
path: root/storage/xtradb/handler
Commit message (Expand)AuthorAgeFilesLines
* Merge 10.1 into 10.2Marko Mäkelä2018-08-311-45/+12
|\
| * Revert MDEV-9519 due to regressionsMarko Mäkelä2018-08-311-45/+12
* | Merge 10.1 into 10.2Marko Mäkelä2018-08-211-12/+45
|\ \ | |/
| * This is patch for the https://jira.mariadb.org/browse/MDEV-9519 issue:Julius Goryavsky2018-08-151-12/+45
* | Merge 10.1 into 10.2Marko Mäkelä2018-08-023-64/+114
|\ \ | |/
| * Merge 10.0 into 10.1Marko Mäkelä2018-07-312-52/+70
| |\
| | * MDEV-16855 Fix fts_sync_synchronization in InnoDBMarko Mäkelä2018-07-301-32/+34
| | * Apply the 5.6.40 security fixes to XtraDBMarko Mäkelä2018-07-301-18/+33
| | * Merge 5.5 into 10.0Marko Mäkelä2018-07-301-1/+2
| | |\
| | | * (no commit message)mariadb-5.5.61Karthik Kamath2018-07-301-1/+3
| * | | Merge branch '10.0' into 10.1Oleksandr Byelkin2018-07-312-12/+44
| |\ \ \ | | |/ /
| | * | Bug #27326796 - MYSQL CRASH WITH INNODB ASSERTION FAILURE IN FILE PARS0PARS.CCSachin Agarwal2018-07-301-1/+36
| | * | Fix InnoDB/XtraDB warnings by GCC 8.2.0Marko Mäkelä2018-07-301-11/+8
* | | | Merge 10.1 into 10.2Marko Mäkelä2018-06-261-0/+6
|\ \ \ \ | |/ / /
| * | | Merge 10.0 into 10.1Marko Mäkelä2018-06-261-0/+6
| |\ \ \ | | |/ /
| | * | MDEV-15953 Alter InnoDB Partitioned Table Moves Files (which were originally ...Eugene Kosov2018-06-261-0/+6
* | | | Merge branch '10.1' into 10.2Sergei Golubchik2018-06-211-8/+10
|\ \ \ \ | |/ / /
| * | | Merge branch '10.0-galera' into 10.1Vicențiu Ciorbaru2018-06-121-8/+10
| |\ \ \
| | * \ \ Merge tag 'mariadb-10.0.35' into 10.0-galeraJan Lindström2018-05-072-9/+13
| | |\ \ \
| | * \ \ \ Merge remote-tracking branch 'origin/5.5-galera' into 10.0-galeraJan Lindström2018-05-071-9/+11
| | |\ \ \ \
| | | * \ \ \ Merge tag 'mariadb-5.5.60' into 5.5-galeraJan Lindström2018-04-243-4/+16
| | | |\ \ \ \ | | | | | |_|/ | | | | |/| |
| | | | * | | BUG#27216817: INNODB: FAILING ASSERTION: PREBUILT->TABLE->N_MYSQL_HANDLES_OPE...Sergei Golubchik2018-04-192-0/+12
| | | * | | | MDEV-8743: O_CLOEXEC on innodb/xtradb temp filesDaniel Black2018-03-021-0/+4
| | | * | | | Merge tag 'mariadb-5.5.58' into 5.5-galeraJan Lindström2017-10-191-2/+3
| | | |\ \ \ \
| | | * | | | | Apply galera patches to XtraDB storage engine and remove one debug output.Jan Lindström2017-07-241-7/+15
| | | * | | | | Merge tag 'mariadb-5.5.57' into 5.5-galeraJan Lindström2017-07-201-23/+1
| | | |\ \ \ \ \
| | | * | | | | | Fix compiler error on gcc 6.x and most of the compiler warnings.Jan Lindström2017-04-051-2/+2
| | | * | | | | | Merge remote-tracking branch 'origin/5.5' into 5.5-galeraNirbhay Choubey2016-10-141-17/+90
| | | |\ \ \ \ \ \
| | | * \ \ \ \ \ \ Merge tag 'mariadb-5.5.51' into 5.5-galeraNirbhay Choubey2016-08-101-1/+3
| | | |\ \ \ \ \ \ \
| | | * \ \ \ \ \ \ \ Merge tag 'mariadb-5.5.50' into 5.5-galeramariadb-galera-5.5.50Nirbhay Choubey2016-06-232-1/+74
| | | |\ \ \ \ \ \ \ \
| | | * \ \ \ \ \ \ \ \ Merge tag 'mariadb-5.5.49' into 5.5-galeraNirbhay Choubey2016-04-253-1/+40
| | | |\ \ \ \ \ \ \ \ \
| | | * \ \ \ \ \ \ \ \ \ Merge tag 'mariadb-5.5.48' into 5.5-galeraNirbhay Choubey2016-02-131-2/+12
| | | |\ \ \ \ \ \ \ \ \ \
| | | * \ \ \ \ \ \ \ \ \ \ Merge tag 'mariadb-5.5.47' into 5.5-galeraNirbhay Choubey2015-12-102-48/+145
| | | |\ \ \ \ \ \ \ \ \ \ \
| | * | \ \ \ \ \ \ \ \ \ \ \ Merge tag 'mariadb-10.0.34' into 10.0-galeramariadb-galera-10.0.34Jan Lindström2018-02-012-8/+63
| | |\ \ \ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ Merge tag 'mariadb-10.0.33' into bb-10.0-galerabb-10.0-sachin-galeraSachin Setiya2017-11-034-68/+79
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \
* | | \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge 10.1 into 10.2Marko Mäkelä2018-06-062-21/+8
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / /
| * | | | | | | | | | | | | | | | MDEV-15824 innodb_defragment=ON trumps innodb_optimize_fulltext_only=ON in OP...Marko Mäkelä2018-06-051-8/+6
| * | | | | | | | | | | | | | | | Remove dead code that was added in MDEV-5834Marko Mäkelä2018-06-052-13/+2
* | | | | | | | | | | | | | | | | Merge remote-tracking branch 'origin/10.1' into 10.2Monty2018-05-241-9/+19
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / /
| * | | | | | | | | | | | | | | | Merge 10.0 into 10.1Marko Mäkelä2018-05-241-9/+19
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|_|_|_|_|_|_|_|/ | | |/| | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | MDEV-16267 Wrong INFORMATION_SCHEMA.INNODB_BUFFER_PAGE.TABLE_NAMEMarko Mäkelä2018-05-241-9/+19
* | | | | | | | | | | | | | | | | Merge branch '10.1' into 10.2Sergei Golubchik2018-05-102-26/+37
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / /
| * | | | | | | | | | | | | | | | Merge 10.0 into 10.1Marko Mäkelä2018-05-071-23/+29
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / / /
| | * | | | | | | | | | | | | | | MDEV-14693 XA: Assertion `!clust_index->online_log' failed in rollback_inplac...Marko Mäkelä2018-05-071-23/+29
| | | |_|_|_|_|_|_|_|_|_|_|_|_|/ | | |/| | | | | | | | | | | | |
| * | | | | | | | | | | | | | | Merge branch '10.0' into 10.1Sergei Golubchik2018-05-051-0/+8
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / /
| | * | | | | | | | | | | | | | Merge branch 'merge-xtradb-5.6' into 10.0Sergei Golubchik2018-04-261-0/+8
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | * | | | | | | | | | | | | | 5.6.39-83.1Sergei Golubchik2018-04-241-0/+8
| * | | | | | | | | | | | | | | | Merge pull request #723 from codership/10.1-MDEV-16005Jan Lindström2018-04-271-3/+0
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | | | | | MDEV-16005 sporadic failures with galera tests MW-328B and MW-328Csjaakola2018-04-241-3/+0
* | | | | | | | | | | | | | | | | | Merge 10.1 into 10.2Marko Mäkelä2018-04-241-8/+4
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / / /