Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Remove XtraDB | Marko Mäkelä | 2017-06-21 | 8 | -12897/+0 |
* | Merge 10.1 into 10.2 | Marko Mäkelä | 2017-06-12 | 1 | -0/+13 |
|\ | |||||
| * | Merge 10.0 into 10.1 | Marko Mäkelä | 2017-06-12 | 1 | -0/+13 |
| |\ | |||||
| | * | MDEV-13039 innodb_fast_shutdown=0 may fail to purge all undo log | Marko Mäkelä | 2017-06-09 | 1 | -0/+13 |
* | | | Merge 10.1 into 10.2 | Marko Mäkelä | 2017-06-08 | 2 | -17/+17 |
|\ \ \ | |/ / | |||||
| * | | Cleanup of MDEV-12600: crash during install_db with innodb_page_size=32K and ... | Marko Mäkelä | 2017-06-08 | 1 | -19/+15 |
| * | | MDEV-12600: crash during install_db with innodb_page_size=32K and ibdata1=3M;bb-10.1-MDEV-12113 | Jan Lindström | 2017-06-01 | 1 | -1/+4 |
| * | | Merge branch '10.0-galera' into 10.1 | Sergei Golubchik | 2017-05-26 | 1 | -1/+2 |
| |\ \ | |||||
| | * \ | Merge branch '10.0' into bb-10.0-galera | Sachin Setiya | 2017-03-20 | 1 | -7/+12 |
| | |\ \ | |||||
| | * | | | Fixed test failure on galere_wsrep_log_conflicts on XtraDB. | Jan Lindström | 2017-03-20 | 1 | -0/+114 |
| | * | | | Merge tag 'mariadb-10.0.30' into bb-sachin-10.0-galera-merge | Sachin Setiya | 2017-03-17 | 4 | -25/+100 |
| | |\ \ \ | |||||
| | * \ \ \ | Merge branch '10.0' into 10.0-galera | Nirbhay Choubey | 2016-08-24 | 5 | -23/+25 |
| | |\ \ \ \ | |||||
| | * \ \ \ \ | Merge tag 'mariadb-10.0.26' into 10.0-galera | Nirbhay Choubey | 2016-06-24 | 2 | -1/+3 |
| | |\ \ \ \ \ | |||||
| | * \ \ \ \ \ | Merge tag 'mariadb-10.0.23' into 10.0-galera | Nirbhay Choubey | 2015-12-19 | 2 | -11/+17 |
| | |\ \ \ \ \ \ | |||||
| | * \ \ \ \ \ \ | Merge tag 'mariadb-10.0.21' into 10.0-galera | Nirbhay Choubey | 2015-08-08 | 2 | -7/+3 |
| | |\ \ \ \ \ \ \ | |||||
| | * \ \ \ \ \ \ \ | Merge tag 'mariadb-10.0.20' into 10.0-galera | Nirbhay Choubey | 2015-06-21 | 1 | -2/+3 |
| | |\ \ \ \ \ \ \ \ | |||||
| | * \ \ \ \ \ \ \ \ | Merge tag 'mariadb-10.0.19' into 10.0-galera | Nirbhay Choubey | 2015-05-09 | 1 | -1/+6 |
| | |\ \ \ \ \ \ \ \ \ | |||||
| | * \ \ \ \ \ \ \ \ \ | bzr merge -rtag:mariadb-10.0.15 maria/10.0 | Nirbhay Choubey | 2014-12-05 | 5 | -27/+20 |
| | |\ \ \ \ \ \ \ \ \ \ | |||||
| | * \ \ \ \ \ \ \ \ \ \ | bzr merge -rtag:mariadb-10.0.14 maria/10.0/ | Nirbhay Choubey | 2014-09-28 | 1 | -11/+11 |
| | |\ \ \ \ \ \ \ \ \ \ \ | |||||
| | * \ \ \ \ \ \ \ \ \ \ \ | bzr merge -r4346 maria/10.0 (maria-10.0.13) | Nirbhay Choubey | 2014-08-11 | 2 | -23/+50 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ | |||||
| | * \ \ \ \ \ \ \ \ \ \ \ \ | bzr merge -r4209 maria/10.0. | Nirbhay Choubey | 2014-05-21 | 1 | -1/+16 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ | Merging revision from codership-mysql/5.5 (r3928..3968) and | Nirbhay Choubey | 2014-03-27 | 1 | -0/+5 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| | | * | | | | | | | | | | | | | | * bzr merge -r4027..4061 codership/5.6 | Nirbhay Choubey | 2014-03-26 | 1 | -0/+5 |
| | * | | | | | | | | | | | | | | | Merging wsrep specific changes from InnoDB to | Nirbhay Choubey | 2014-03-26 | 2 | -5/+43 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| | | * | | | | | | | | | | | | | | | Merging InnoDB changes to xtradb (r3783..3808). | Nirbhay Choubey | 2014-03-26 | 2 | -12/+48 |
| | | |/ / / / / / / / / / / / / / | |||||
| | * | | | | | | | | | | | | | | | * bzr merge -rtag:mariadb-10.0.9 maria/10.0 | Nirbhay Choubey | 2014-03-26 | 3 | -17/+37 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / / / / / / | | |/| | | | | | | | | | | | | | | |||||
| | * | | | | | | | | | | | | | | | Merge MariaDB-10.0.7 revision 3961. | Jan Lindström | 2014-01-25 | 10 | -5923/+5561 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | merge with MariaDB 5.6 bzr merge lp:maria --rtag:mariadb-10.0.6 | Seppo Jaakola | 2013-12-04 | 6 | -16/+18 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge 10.0 to galera-10.0 | Jan Lindström | 2013-09-03 | 2 | -4/+19 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merged with lp:maria revision #3766 | Seppo Jaakola | 2013-07-13 | 4 | -54/+224 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| | * | | | | | | | | | | | | | | | | | | | Initial merge result with mariaDB 10: lp:maria | Seppo Jaakola | 2013-07-13 | 3 | -0/+136 |
* | | | | | | | | | | | | | | | | | | | | | Merge 10.1 into 10.2 | Marko Mäkelä | 2017-05-23 | 3 | -15/+12 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / / / / / / | |||||
| * | | | | | | | | | | | | | | | | | | | | Merge 10.0 into 10.1 | Marko Mäkelä | 2017-05-20 | 3 | -15/+12 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ | | |/| | | | | | | | | | | | | | | | | | | |||||
| | * | | | | | | | | | | | | | | | | | | | Merge remote-tracking branch 'origin/10.0' into 10.0 | Vicențiu Ciorbaru | 2017-05-18 | 2 | -34/+12 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'merge-xtradb-5.6' into 10.0 | Vicențiu Ciorbaru | 2017-05-17 | 4 | -16/+14 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ | | |/| | | | | | | | | | | | | | | | | | | | |||||
| | | * | | | | | | | | | | | | | | | | | | | 5.6.36-82.0 | Vicențiu Ciorbaru | 2017-05-16 | 4 | -16/+14 |
* | | | | | | | | | | | | | | | | | | | | | | Merge 10.1 into 10.2 | Marko Mäkelä | 2017-05-22 | 2 | -34/+12 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / / / / / / / | |||||
| * | | | | | | | | | | | | | | | | | | | | | Merge 10.0 into 10.1 | Marko Mäkelä | 2017-05-19 | 1 | -33/+9 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|/ / / / / / / / / / / / / / / / / / | | |/| | | | | | | | | | | | | | | | | | | | |||||
| | * | | | | | | | | | | | | | | | | | | | | Refactor trx_undo_report_row_operation() | Marko Mäkelä | 2017-05-18 | 1 | -33/+9 |
| | * | | | | | | | | | | | | | | | | | | | | Never pass NULL to innobase_get_stmt() | Marko Mäkelä | 2017-05-17 | 1 | -1/+3 |
| | |/ / / / / / / / / / / / / / / / / / / | |||||
| * | | | | | | | | | | | | | | | | | | | | Never pass NULL to innobase_get_stmt() | Marko Mäkelä | 2017-05-17 | 1 | -1/+3 |
* | | | | | | | | | | | | | | | | | | | | | Merge 10.1 into 10.2 | Marko Mäkelä | 2017-05-06 | 2 | -16/+35 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / / / / / / | |||||
| * | | | | | | | | | | | | | | | | | | | | MDEV-9566 Prepare xtradb for xtrabackup | Vladislav Vaintroub | 2017-04-27 | 2 | -16/+35 |
* | | | | | | | | | | | | | | | | | | | | | Merge 10.1 into 10.2 | Marko Mäkelä | 2017-05-05 | 1 | -1/+1 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / / / / / / | |||||
| * | | | | | | | | | | | | | | | | | | | | MDEV-12253: Buffer pool blocks are accessed after they have been freed | Jan Lindström | 2017-04-26 | 1 | -1/+1 |
* | | | | | | | | | | | | | | | | | | | | | Merge 10.1 into 10.2 | Marko Mäkelä | 2017-04-28 | 1 | -0/+112 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / / / / / / | |||||
| * | | | | | | | | | | | | | | | | | | | | MW-28, codership/mysql-wsrep#28 Fix sync_thread_levels debug assert | Sachin Setiya | 2017-04-06 | 1 | -0/+112 |
* | | | | | | | | | | | | | | | | | | | | | Merge branch '10.1' into 10.2 | Sergei Golubchik | 2017-03-30 | 5 | -34/+114 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / / / / / / | |||||
| * | | | | | | | | | | | | | | | | | | | | MDEV-12345 Performance : replace calls to clock() inside trx_start_low() by T... | Vladislav Vaintroub | 2017-03-23 | 1 | -1/+2 |
| * | | | | | | | | | | | | | | | | | | | | Merge 10.0 into 10.1 | Marko Mäkelä | 2017-03-13 | 1 | -8/+12 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / / / / / / / |