Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge remote-tracking branch 'origin/bb-10.1-jplindst' into 10.1 | Jan Lindström | 2017-08-29 | 1 | -3/+3 |
|\ | |||||
| * | Merge remote-tracking branch 'origin/10.0-galera' into 10.1 | Jan Lindström | 2017-08-21 | 1 | -3/+3 |
| |\ | |||||
| | * | Refs: MW-369 * changed parent row key type to S(hared), when FK child table i... | sjaakola | 2017-08-14 | 1 | -5/+10 |
| | * | Refs: MW-369 * changed insert for a FK child table to take exclusive lock on ... | sjaakola | 2017-08-14 | 1 | -1/+1 |
| | * | Merge tag 'mariadb-10.0.31' into 10.0-galera | Sachin Setiya | 2017-05-30 | 1 | -6/+3 |
| | |\ | |||||
| | * \ | Merge branch '10.0' into 10.0-galera | Nirbhay Choubey | 2016-08-24 | 1 | -15/+15 |
| | |\ \ | |||||
| | * \ \ | Merge tag 'mariadb-10.0.23' into 10.0-galera | Nirbhay Choubey | 2015-12-19 | 1 | -11/+33 |
| | |\ \ \ | |||||
| | * \ \ \ | Merge tag 'mariadb-10.0.22' into 10.0-galera | Nirbhay Choubey | 2015-10-31 | 1 | -20/+51 |
| | |\ \ \ \ | |||||
| | * \ \ \ \ | Merge tag 'mariadb-10.0.21' into 10.0-galera | Nirbhay Choubey | 2015-08-08 | 1 | -0/+2 |
| | |\ \ \ \ \ | |||||
| | * \ \ \ \ \ | bzr merge -rtag:mariadb-10.0.15 maria/10.0 | Nirbhay Choubey | 2014-12-05 | 1 | -22/+14 |
| | |\ \ \ \ \ \ | |||||
| | * \ \ \ \ \ \ | bzr merge -rtag:mariadb-10.0.14 maria/10.0/ | Nirbhay Choubey | 2014-09-28 | 1 | -13/+13 |
| | |\ \ \ \ \ \ \ | |||||
| | * \ \ \ \ \ \ \ | bzr merge -r4346 maria/10.0 (maria-10.0.13) | Nirbhay Choubey | 2014-08-11 | 1 | -7/+9 |
| | |\ \ \ \ \ \ \ \ | |||||
| | * | | | | | | | | | bzr merge -r4091..4101 codership/5.6/ | Nirbhay Choubey | 2014-06-19 | 1 | -4/+0 |
| | * | | | | | | | | | bzr merge -r4065..4088 codership/5.6 | Nirbhay Choubey | 2014-05-21 | 1 | -4/+4 |
| | * | | | | | | | | | bzr merge -r4209 maria/10.0. | Nirbhay Choubey | 2014-05-21 | 1 | -1/+5 |
| | |\ \ \ \ \ \ \ \ \ | |||||
| | * \ \ \ \ \ \ \ \ \ | Merging revision from codership-mysql/5.5 (r3928..3968) and | Nirbhay Choubey | 2014-03-27 | 1 | -24/+4 |
| | |\ \ \ \ \ \ \ \ \ \ | |||||
| | | * | | | | | | | | | | * bzr merge -r4027..4061 codership/5.6 | Nirbhay Choubey | 2014-03-26 | 1 | -24/+4 |
| | * | | | | | | | | | | | Merging InnoDB changes to xtradb (r3783..3808). | Nirbhay Choubey | 2014-03-26 | 1 | -12/+11 |
| | |/ / / / / / / / / / | |||||
| | * | | | | | | | | | | Fixed issue on wsrep_kill_victim mutexing order error. Furthermore, fixed merge | Jan Lindström | 2014-01-29 | 1 | -7/+9 |
| | * | | | | | | | | | | Merge MariaDB-10.0.7 revision 3961. | Jan Lindström | 2014-01-25 | 1 | -1/+51 |
* | | | | | | | | | | | | Merge 10.0 into 10.1 | Marko Mäkelä | 2017-08-28 | 1 | -0/+6 |
|\ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / |/| | | | | | | | | | | | |||||
| * | | | | | | | | | | | MDEV-13637 InnoDB change buffer housekeeping can cause redo log overrun and p... | Marko Mäkelä | 2017-08-25 | 1 | -0/+6 |
| | |_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | | |||||
* | | | | | | | | | | | MDEV-12398 All cluster nodes stop due to a foreign key constraint failure | Sachin Setiya | 2017-06-22 | 1 | -7/+12 |
* | | | | | | | | | | | Merge 10.0 into 10.1 | Marko Mäkelä | 2017-05-19 | 1 | -6/+3 |
|\ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / | |||||
| * | | | | | | | | | | MDEV-12358 Work around what looks like a bug in GCC 7.1.0 | Marko Mäkelä | 2017-05-17 | 1 | -6/+3 |
| | |_|_|_|_|_|_|_|/ | |/| | | | | | | | | |||||
* | | | | | | | | | | MDEV-12253: Buffer pool blocks are accessed after they have been freed | Jan Lindström | 2017-04-26 | 1 | -4/+3 |
* | | | | | | | | | | Merge branch '10.0' into 10.1 | Sergei Golubchik | 2016-08-25 | 1 | -15/+15 |
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / | |||||
| * | | | | | | | | | Merge branch 'merge/merge-xtradb-5.6' into 10.0 | Sergei Golubchik | 2016-08-10 | 1 | -15/+15 |
| |\ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|/ | |/| | | | | | | | | |||||
| | * | | | | | | | | 5.6.31-77.0 | Sergei Golubchik | 2016-08-10 | 1 | -15/+15 |
* | | | | | | | | | | Merge branch '10.0' into 10.1 | Sergei Golubchik | 2015-12-21 | 1 | -11/+33 |
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / | |||||
| * | | | | | | | | | MDEV-9276: MySQL Bug #78754: FK definitions missing from SHOW CREATE TABLE in... | Jan Lindström | 2015-12-14 | 1 | -6/+16 |
| * | | | | | | | | | Merge branch 'merge/merge-xtradb-5.6' into 10.0 | Sergei Golubchik | 2015-12-13 | 1 | -5/+17 |
| |\ \ \ \ \ \ \ \ \ | | |/ / / / / / / / | | | | | | | | | / | | |_|_|_|_|_|_|/ | |/| | | | | | | | |||||
| | * | | | | | | | 5.6.27-76.0 | Sergei Golubchik | 2015-12-13 | 1 | -5/+17 |
* | | | | | | | | | Merge branch '10.0' into 10.1 | Sergei Golubchik | 2015-10-12 | 1 | -20/+51 |
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / | |||||
| * | | | | | | | | Merge branch 'merge-xtradb-5.6' into 10.0 | Sergei Golubchik | 2015-10-09 | 1 | -20/+51 |
| |\ \ \ \ \ \ \ \ | | |/ / / / / / / | | | | | | | | / | | |_|_|_|_|_|/ | |/| | | | | | | |||||
| | * | | | | | | 5.6.26-74.0 | Sergei Golubchik | 2015-10-09 | 1 | -20/+51 |
* | | | | | | | | MDEV-8764: Wrong error when encrypted table can't be decrypted. | Jan Lindström | 2015-09-14 | 1 | -2/+2 |
* | | | | | | | | MDEV-8588: Assertion failure in file ha_innodb.cc line 21140 if at least o... | Jan Lindström | 2015-09-04 | 1 | -5/+25 |
* | | | | | | | | Merge branch '10.0' into 10.1 | Sergei Golubchik | 2015-09-03 | 1 | -0/+2 |
|\ \ \ \ \ \ \ \ | |/ / / / / / / | |||||
| * | | | | | | | Merge branch 'merge-xtradb-5.6' into 10.0 | Sergei Golubchik | 2015-08-03 | 1 | -0/+2 |
| |\ \ \ \ \ \ \ | | |/ / / / / / | | | | | | | / | | |_|_|_|_|/ | |/| | | | | | |||||
| | * | | | | | 5.6.25-73.1 | Sergei Golubchik | 2015-08-01 | 1 | -0/+2 |
| | * | | | | | move to storage/xtradb | Sergei Golubchik | 2015-05-04 | 1 | -0/+3358 |
| | / / / / | |||||
* | | | | | | Merge branch '10.0' into bb-10.1-merge | Sergei Golubchik | 2014-12-02 | 1 | -22/+14 |
|\ \ \ \ \ \ | |/ / / / / | |||||
| * | | | | | XtraDB 5.6.21-70.0 | Sergei Golubchik | 2014-11-20 | 1 | -11/+1 |
| * | | | | | MDEV-6928: Add trx pointer to struct mtr_t | Jan Lindström | 2014-10-24 | 1 | -11/+13 |
| | |_|_|/ | |/| | | | |||||
* | | | | | Merge 10.0.14 into 10.1 | Sergei Golubchik | 2014-10-15 | 1 | -20/+22 |
|\ \ \ \ \ | |/ / / / | |||||
| * | | | | XtraDB 5.6.20-68.0 | Sergei Golubchik | 2014-09-11 | 1 | -13/+13 |
| | |_|/ | |/| | | |||||
| * | | | xtradb-5.6.19-67.0 | Sergei Golubchik | 2014-08-06 | 1 | -7/+9 |
| | |/ | |/| | |||||
* | | | MDEV-6247: Merge 10.0-galera to 10.1. | Jan Lindström | 2014-08-26 | 1 | -2/+29 |
|/ / | |||||
* | | xtradb 5.6.17-65.0 | Sergei Golubchik | 2014-05-07 | 1 | -1/+5 |
|/ |