Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch '10.1' into 10.2 | Sergei Golubchik | 2016-09-09 | 5 | -23/+25 |
|\ | |||||
| * | Merge branch '10.0' into 10.1 | Sergei Golubchik | 2016-08-25 | 5 | -23/+25 |
| |\ | |||||
| | * | Merge branch 'merge/merge-xtradb-5.6' into 10.0 | Sergei Golubchik | 2016-08-10 | 5 | -23/+25 |
| | |\ | |||||
| | | * | 5.6.31-77.0 | Sergei Golubchik | 2016-08-10 | 5 | -23/+25 |
* | | | | Merge branch '10.1' into 10.2 | Sergei Golubchik | 2016-06-30 | 2 | -1/+3 |
|\ \ \ \ | |/ / / | |||||
| * | | | Merge branch '10.0' into 10.1 | Sergei Golubchik | 2016-06-28 | 2 | -1/+3 |
| |\ \ \ | | |/ / | |||||
| | * | | Merge following commit from 5.5: | Jan Lindström | 2016-06-23 | 1 | -1/+1 |
| | * | | Merge branch 'merge-xtradb-5.6' into 0.0 | Sergei Golubchik | 2016-06-21 | 1 | -0/+2 |
| | |\ \ | | | |/ | |||||
| | | * | 5.6.30-76.3 | Sergei Golubchik | 2016-06-21 | 1 | -0/+2 |
* | | | | MDEV-6368: assertion xid_seqno > trx_sys_cur_xid_seqno | Nirbhay Choubey | 2016-05-31 | 1 | -2/+11 |
|/ / / | |||||
* | | | Merge branch '10.0' into 10.1 | Sergei Golubchik | 2015-12-21 | 2 | -11/+17 |
|\ \ \ | |/ / | |||||
| * | | Merge branch 'merge/merge-xtradb-5.6' into 10.0 | Sergei Golubchik | 2015-12-13 | 2 | -11/+17 |
| |\ \ | | |/ | |||||
| | * | 5.6.27-76.0 | Sergei Golubchik | 2015-12-13 | 2 | -11/+17 |
* | | | Merge branch '10.0' into 10.1 | Sergei Golubchik | 2015-09-03 | 2 | -7/+3 |
|\ \ \ | |/ / | |||||
| * | | Merge branch 'merge-xtradb-5.6' into 10.0 | Sergei Golubchik | 2015-08-03 | 2 | -7/+3 |
| |\ \ | | |/ | |||||
| | * | 5.6.25-73.1 | Sergei Golubchik | 2015-08-01 | 2 | -7/+4 |
* | | | Merge tag 'mariadb-10.0.20' into 10.1 | Sergei Golubchik | 2015-06-27 | 1 | -2/+3 |
|\ \ \ | |/ / | |||||
| * | | Fix test case innodb.xa_recovery crash on xtradb. | Jan Lindström | 2015-06-16 | 1 | -2/+3 |
* | | | Merge tag 'mariadb-10.0.19' into 10.1 | Sergei Golubchik | 2015-06-01 | 1 | -0/+5 |
|\ \ \ | |/ / | |||||
| * | | XtraDB-5.6.23-72.1 | Sergei Golubchik | 2015-05-05 | 1 | -0/+5 |
| |\ \ | | |/ | |||||
| | * | 5.6.23-72.1 | Sergei Golubchik | 2015-05-04 | 1 | -0/+5 |
| | * | move to storage/xtradb | Sergei Golubchik | 2015-05-04 | 8 | -0/+12475 |
* | | Merge 10.0 -> 10.1 | Kristian Nielsen | 2015-04-20 | 1 | -1/+1 |
|\ \ | |/ | |||||
| * | MDEV-7908: assertion in innobase_release_savepoint | Jan Lindström | 2015-04-06 | 1 | -1/+1 |
* | | Merge branch '10.0' into bb-10.1-merge | Sergei Golubchik | 2014-12-02 | 5 | -27/+20 |
|\ \ | |/ | |||||
| * | XtraDB 5.6.21-70.0 | Sergei Golubchik | 2014-11-20 | 2 | -16/+11 |
| * | MDEV-6925: Remove bad "" operators. | Jan Lindström | 2014-10-26 | 1 | -1/+1 |
| * | MDEV-6928: Add trx pointer to struct mtr_t | Jan Lindström | 2014-10-24 | 2 | -10/+8 |
* | | MDEV-6929: Port Facebook Prefix Index Queries Optimization | Jan Lindström | 2014-11-03 | 1 | -1/+2 |
* | | Merge 10.0.14 into 10.1 | Sergei Golubchik | 2014-10-15 | 3 | -34/+61 |
|\ \ | |/ | |||||
| * | XtraDB 5.6.20-68.0 | Sergei Golubchik | 2014-09-11 | 1 | -11/+11 |
| * | xtradb-5.6.19-67.0 | Sergei Golubchik | 2014-08-06 | 2 | -3/+35 |
| * | MDEV-5262, MDEV-5914, MDEV-5941, MDEV-6020: Deadlocks during parallel replica... | Kristian Nielsen | 2014-07-09 | 1 | -5/+5 |
| * | MDEV-5262, MDEV-5914, MDEV-5941, MDEV-6020: Deadlocks during parallel replica... | Kristian Nielsen | 2014-07-08 | 1 | -0/+3 |
| * | MDEV-5262, MDEV-5914, MDEV-5941, MDEV-6020: Deadlocks during parallel | unknown | 2014-06-10 | 1 | -20/+12 |
* | | fixing embedded: WaaS. Wsrep as a Service. | Sergei Golubchik | 2014-10-01 | 3 | -2/+8 |
* | | MDEV-6247: Merge 10.0-galera to 10.1. | Jan Lindström | 2014-08-26 | 3 | -1/+192 |
|/ | |||||
* | xtradb 5.6.17-65.0 | Sergei Golubchik | 2014-05-07 | 1 | -1/+2 |
* | MDEV-6184 10.0.11 merge | Sergei Golubchik | 2014-05-06 | 1 | -0/+14 |
* | Percona-Server-5.6.15-rel63.0.tar.gz merge | Sergei Golubchik | 2014-02-26 | 3 | -10/+30 |
* | Percona-Server-5.6.14-rel62.0 merge | Sergei Golubchik | 2013-12-22 | 10 | -5776/+5417 |
* | 5.5 merge | Sergei Golubchik | 2013-11-23 | 1 | -21/+6 |
|\ | |||||
| * | Percona-Server-5.5.34-rel32.0 merge | Sergei Golubchik | 2013-11-19 | 1 | -21/+6 |
* | | 5.5 merge and fixes for compiler/test errors | Sergei Golubchik | 2013-09-18 | 5 | -13/+13 |
|\ \ | |/ | |||||
| * | Percona-Server-5.5.33-rel31.1.tar.gz | Sergei Golubchik | 2013-09-07 | 5 | -13/+13 |
* | | merge 5.5 -> 10.0-base | unknown | 2013-08-20 | 1 | -3/+5 |
|\ \ | |/ | |||||
| * | Revert reverted patch (as workaround) to have no problem with ongoing fix. | unknown | 2013-07-19 | 1 | -3/+5 |
* | | 5.5 merge | Sergei Golubchik | 2013-07-17 | 2 | -4/+19 |
|\ \ | |/ | |||||
| * | Revert of marko.makela@oracle.com-20130430103950-j353faze84zzk9xf for xtradb | unknown | 2013-07-17 | 1 | -5/+3 |
| * | merge Percona-Server-5.5.32-rel31.0.tar.gz | Sergei Golubchik | 2013-07-16 | 2 | -7/+24 |