summaryrefslogtreecommitdiff
path: root/storage/xtradb/trx
Commit message (Expand)AuthorAgeFilesLines
* Remove XtraDBMarko Mäkelä2017-06-218-12897/+0
* Merge 10.1 into 10.2Marko Mäkelä2017-06-121-0/+13
|\
| * Merge 10.0 into 10.1Marko Mäkelä2017-06-121-0/+13
| |\
| | * MDEV-13039 innodb_fast_shutdown=0 may fail to purge all undo logMarko Mäkelä2017-06-091-0/+13
* | | Merge 10.1 into 10.2Marko Mäkelä2017-06-082-17/+17
|\ \ \ | |/ /
| * | Cleanup of MDEV-12600: crash during install_db with innodb_page_size=32K and ...Marko Mäkelä2017-06-081-19/+15
| * | MDEV-12600: crash during install_db with innodb_page_size=32K and ibdata1=3M;bb-10.1-MDEV-12113Jan Lindström2017-06-011-1/+4
| * | Merge branch '10.0-galera' into 10.1Sergei Golubchik2017-05-261-1/+2
| |\ \
| | * \ Merge branch '10.0' into bb-10.0-galeraSachin Setiya2017-03-201-7/+12
| | |\ \
| | * | | Fixed test failure on galere_wsrep_log_conflicts on XtraDB.Jan Lindström2017-03-201-0/+114
| | * | | Merge tag 'mariadb-10.0.30' into bb-sachin-10.0-galera-mergeSachin Setiya2017-03-174-25/+100
| | |\ \ \
| | * \ \ \ Merge branch '10.0' into 10.0-galeraNirbhay Choubey2016-08-245-23/+25
| | |\ \ \ \
| | * \ \ \ \ Merge tag 'mariadb-10.0.26' into 10.0-galeraNirbhay Choubey2016-06-242-1/+3
| | |\ \ \ \ \
| | * \ \ \ \ \ Merge tag 'mariadb-10.0.23' into 10.0-galeraNirbhay Choubey2015-12-192-11/+17
| | |\ \ \ \ \ \
| | * \ \ \ \ \ \ Merge tag 'mariadb-10.0.21' into 10.0-galeraNirbhay Choubey2015-08-082-7/+3
| | |\ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ Merge tag 'mariadb-10.0.20' into 10.0-galeraNirbhay Choubey2015-06-211-2/+3
| | |\ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ Merge tag 'mariadb-10.0.19' into 10.0-galeraNirbhay Choubey2015-05-091-1/+6
| | |\ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ bzr merge -rtag:mariadb-10.0.15 maria/10.0Nirbhay Choubey2014-12-055-27/+20
| | |\ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ bzr merge -rtag:mariadb-10.0.14 maria/10.0/Nirbhay Choubey2014-09-281-11/+11
| | |\ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ bzr merge -r4346 maria/10.0 (maria-10.0.13)Nirbhay Choubey2014-08-112-23/+50
| | |\ \ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ \ bzr merge -r4209 maria/10.0.Nirbhay Choubey2014-05-211-1/+16
| | |\ \ \ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ Merging revision from codership-mysql/5.5 (r3928..3968) andNirbhay Choubey2014-03-271-0/+5
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | * | | | | | | | | | | | | | * bzr merge -r4027..4061 codership/5.6Nirbhay Choubey2014-03-261-0/+5
| | * | | | | | | | | | | | | | | Merging wsrep specific changes from InnoDB toNirbhay Choubey2014-03-262-5/+43
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | * | | | | | | | | | | | | | | Merging InnoDB changes to xtradb (r3783..3808).Nirbhay Choubey2014-03-262-12/+48
| | | |/ / / / / / / / / / / / / /
| | * | | | | | | | | | | | | | | * bzr merge -rtag:mariadb-10.0.9 maria/10.0Nirbhay Choubey2014-03-263-17/+37
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / / / / / / | | |/| | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | Merge MariaDB-10.0.7 revision 3961.Jan Lindström2014-01-2510-5923/+5561
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ merge with MariaDB 5.6 bzr merge lp:maria --rtag:mariadb-10.0.6Seppo Jaakola2013-12-046-16/+18
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge 10.0 to galera-10.0Jan Lindström2013-09-032-4/+19
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merged with lp:maria revision #3766Seppo Jaakola2013-07-134-54/+224
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | | | | | | | | Initial merge result with mariaDB 10: lp:mariaSeppo Jaakola2013-07-133-0/+136
* | | | | | | | | | | | | | | | | | | | | Merge 10.1 into 10.2Marko Mäkelä2017-05-233-15/+12
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / / / / / /
| * | | | | | | | | | | | | | | | | | | | Merge 10.0 into 10.1Marko Mäkelä2017-05-203-15/+12
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ | | |/| | | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | | | Merge remote-tracking branch 'origin/10.0' into 10.0Vicențiu Ciorbaru2017-05-182-34/+12
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'merge-xtradb-5.6' into 10.0Vicențiu Ciorbaru2017-05-174-16/+14
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ | | |/| | | | | | | | | | | | | | | | | | |
| | | * | | | | | | | | | | | | | | | | | | 5.6.36-82.0Vicențiu Ciorbaru2017-05-164-16/+14
* | | | | | | | | | | | | | | | | | | | | | Merge 10.1 into 10.2Marko Mäkelä2017-05-222-34/+12
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / / / / / / /
| * | | | | | | | | | | | | | | | | | | | | Merge 10.0 into 10.1Marko Mäkelä2017-05-191-33/+9
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|/ / / / / / / / / / / / / / / / / / | | |/| | | | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | | | | Refactor trx_undo_report_row_operation()Marko Mäkelä2017-05-181-33/+9
| | * | | | | | | | | | | | | | | | | | | | Never pass NULL to innobase_get_stmt()Marko Mäkelä2017-05-171-1/+3
| | |/ / / / / / / / / / / / / / / / / / /
| * | | | | | | | | | | | | | | | | | | | Never pass NULL to innobase_get_stmt()Marko Mäkelä2017-05-171-1/+3
* | | | | | | | | | | | | | | | | | | | | Merge 10.1 into 10.2Marko Mäkelä2017-05-062-16/+35
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / / / / / /
| * | | | | | | | | | | | | | | | | | | | MDEV-9566 Prepare xtradb for xtrabackupVladislav Vaintroub2017-04-272-16/+35
* | | | | | | | | | | | | | | | | | | | | Merge 10.1 into 10.2Marko Mäkelä2017-05-051-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / / / / / /
| * | | | | | | | | | | | | | | | | | | | MDEV-12253: Buffer pool blocks are accessed after they have been freedJan Lindström2017-04-261-1/+1
* | | | | | | | | | | | | | | | | | | | | Merge 10.1 into 10.2Marko Mäkelä2017-04-281-0/+112
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / / / / / /
| * | | | | | | | | | | | | | | | | | | | MW-28, codership/mysql-wsrep#28 Fix sync_thread_levels debug assertSachin Setiya2017-04-061-0/+112
* | | | | | | | | | | | | | | | | | | | | Merge branch '10.1' into 10.2Sergei Golubchik2017-03-305-34/+114
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / / / / / /
| * | | | | | | | | | | | | | | | | | | | MDEV-12345 Performance : replace calls to clock() inside trx_start_low() by T...Vladislav Vaintroub2017-03-231-1/+2
| * | | | | | | | | | | | | | | | | | | | Merge 10.0 into 10.1Marko Mäkelä2017-03-131-8/+12
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / / / / / / /