Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Remove XtraDB | Marko Mäkelä | 2017-06-21 | 1 | -6431/+0 |
* | Merge remote-tracking branch 'origin/10.2' into bb-10.2-ext | Alexander Barkov | 2017-06-15 | 1 | -6/+6 |
|\ | |||||
| * | Merge 10.1 into 10.2 | Marko Mäkelä | 2017-05-22 | 1 | -6/+6 |
| |\ | |||||
| | * | Merge 10.0 into 10.1 | Marko Mäkelä | 2017-05-19 | 1 | -6/+6 |
| | |\ | |||||
| | | * | Fix some __attribute__((nonnull)) misuse | Marko Mäkelä | 2017-05-18 | 1 | -6/+6 |
* | | | | Merge tag 'mariadb-10.2.6' into bb-10.2-ext | Alexander Barkov | 2017-05-26 | 1 | -6/+56 |
|\ \ \ \ | |/ / / | |||||
| * | | | Merge 10.1 into 10.2 | Marko Mäkelä | 2017-05-05 | 1 | -6/+56 |
| |\ \ \ | | |/ / | |||||
| | * | | MDEV-12253: Buffer pool blocks are accessed after they have been freed | Jan Lindström | 2017-04-26 | 1 | -6/+56 |
* | | | | MDEV-12695 Add Column_definition::type_handler() | Alexander Barkov | 2017-05-05 | 1 | -1/+1 |
* | | | | Changing field::field_name and Item::name to LEX_CSTRING | Monty | 2017-04-23 | 1 | -25/+25 |
|/ / / | |||||
* | | | Merge 10.1 into 10.2 | Marko Mäkelä | 2017-04-06 | 1 | -1/+0 |
|\ \ \ | |/ / | |||||
| * | | Merge 10.0 into 10.1 | Marko Mäkelä | 2017-04-06 | 1 | -1/+0 |
| |\ \ | | |/ | |||||
| | * | Import two ALTER TABLE…ALGORITHM=INPLACE tests from MySQL 5.6. | Marko Mäkelä | 2017-04-05 | 1 | -1/+0 |
* | | | Merge branch '10.1' into 10.2 | Sergei Golubchik | 2017-03-30 | 1 | -37/+48 |
|\ \ \ | |/ / | |||||
| * | | MDEV-11738: Mariadb uses 100% of several of my 8 cpus doing nothing | Jan Lindström | 2017-03-14 | 1 | -2/+4 |
| * | | Merge 10.0 into 10.1 | Marko Mäkelä | 2017-03-09 | 1 | -35/+44 |
| |\ \ | | |/ | |||||
| | * | Merge branch 'merge-xtradb-5.6' into 10.0 | Vicențiu Ciorbaru | 2017-03-05 | 1 | -35/+44 |
| | |\ | |||||
| | | * | 5.6.35-80.0 | Vicențiu Ciorbaru | 2017-03-04 | 1 | -44/+44 |
* | | | | Merge 10.1 into 10.2 | Marko Mäkelä | 2017-01-05 | 1 | -1/+1 |
|\ \ \ \ | |/ / / | |||||
| * | | | Merge 10.0 into 10.1 | Marko Mäkelä | 2017-01-05 | 1 | -1/+1 |
| |\ \ \ | | |/ / | |||||
| | * | | MDEV-11730 Memory leak in innodb.innodb_corrupt_bit | Marko Mäkelä | 2017-01-05 | 1 | -1/+1 |
* | | | | Merge 10.1 to 10.2 | Marko Mäkelä | 2017-01-05 | 1 | -61/+2 |
|\ \ \ \ | |/ / / | |||||
| * | | | Merge 10.0 into 10.1 | Marko Mäkelä | 2017-01-04 | 1 | -61/+2 |
| |\ \ \ | | |/ / | |||||
| | * | | MDEV-11694 InnoDB tries to create unused table SYS_ZIP_DICTbb-10.0-mdev-11694 | Marko Mäkelä | 2017-01-03 | 1 | -60/+2 |
* | | | | Merge branch '10.1' into 10.2 | Sergei Golubchik | 2016-12-29 | 1 | -10/+75 |
|\ \ \ \ | |/ / / | |||||
| * | | | Merge branch '10.0' into 10.1 | Sergei Golubchik | 2016-12-11 | 1 | -0/+10 |
| |\ \ \ | | |/ / | |||||
| | * | | Initialize zip_dict_ids table and avoid referencing array items | Jan Lindström | 2016-11-01 | 1 | -0/+10 |
| * | | | Merge branch '10.0-galera' into 10.1 | Sergei Golubchik | 2016-11-02 | 1 | -10/+65 |
| |\ \ \ | |||||
| | * \ \ | Merge tag 'mariadb-10.0.28' into 10.0-galera | Nirbhay Choubey | 2016-10-28 | 1 | -10/+65 |
| | |\ \ \ | | | |/ / | |||||
| | | * | | Merge branch 'merge/merge-xtradb-5.6' into 10.0 | Sergei Golubchik | 2016-10-25 | 1 | -10/+65 |
| | | |\ \ | | | | |/ | |||||
| | | | * | 5.6.33-79.0 | Sergei Golubchik | 2016-10-25 | 1 | -10/+56 |
| | * | | | Merge branch '10.0' into 10.0-galera | Nirbhay Choubey | 2016-08-24 | 1 | -40/+40 |
| | |\ \ \ | | | |/ / | |||||
| | * | | | Merge tag 'mariadb-10.0.26' into 10.0-galera | Nirbhay Choubey | 2016-06-24 | 1 | -0/+18 |
| | |\ \ \ | |||||
| | * \ \ \ | Merge branch '10.0' into 10.0-galera | Nirbhay Choubey | 2016-04-29 | 1 | -2/+38 |
| | |\ \ \ \ | |||||
| | * \ \ \ \ | Merge tag 'mariadb-10.0.24' into 10.0-galera | Nirbhay Choubey | 2016-02-23 | 1 | -35/+157 |
| | |\ \ \ \ \ | |||||
| | * \ \ \ \ \ | Merge tag 'mariadb-10.0.23' into 10.0-galera | Nirbhay Choubey | 2015-12-19 | 1 | -8/+3 |
| | |\ \ \ \ \ \ | |||||
| | * \ \ \ \ \ \ | Merge tag 'mariadb-10.0.22' into 10.0-galera | Nirbhay Choubey | 2015-10-31 | 1 | -68/+98 |
| | |\ \ \ \ \ \ \ | |||||
| | * \ \ \ \ \ \ \ | Merge tag 'mariadb-10.0.21' into 10.0-galera | Nirbhay Choubey | 2015-08-08 | 1 | -6/+36 |
| | |\ \ \ \ \ \ \ \ | |||||
| | * \ \ \ \ \ \ \ \ | Merge tag 'mariadb-10.0.20' into 10.0-galera | Nirbhay Choubey | 2015-06-21 | 1 | -1/+1 |
| | |\ \ \ \ \ \ \ \ \ | |||||
| | * \ \ \ \ \ \ \ \ \ | Merge tag 'mariadb-10.0.19' into 10.0-galera | Nirbhay Choubey | 2015-05-09 | 1 | -6/+34 |
| | |\ \ \ \ \ \ \ \ \ \ | |||||
| | * \ \ \ \ \ \ \ \ \ \ | maria-10.0.16 merge | Nirbhay Choubey | 2015-01-26 | 1 | -8/+1 |
| | |\ \ \ \ \ \ \ \ \ \ \ | |||||
| | * \ \ \ \ \ \ \ \ \ \ \ | bzr merge -rtag:mariadb-10.0.15 maria/10.0 | Nirbhay Choubey | 2014-12-05 | 1 | -17/+42 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ | |||||
| | * \ \ \ \ \ \ \ \ \ \ \ \ | bzr merge -rtag:mariadb-10.0.14 maria/10.0/ | Nirbhay Choubey | 2014-09-28 | 1 | -32/+38 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ | bzr merge -r4346 maria/10.0 (maria-10.0.13) | Nirbhay Choubey | 2014-08-11 | 1 | -0/+3 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ | bzr merge -rtag:mariadb-10.0.12 maria/10.0 | Nirbhay Choubey | 2014-06-19 | 1 | -2/+6 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | bzr merge -r4209 maria/10.0. | Nirbhay Choubey | 2014-05-21 | 1 | -21/+92 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | * bzr merge -rtag:mariadb-10.0.9 maria/10.0 | Nirbhay Choubey | 2014-03-26 | 1 | -1/+11 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge MariaDB-10.0.7 revision 3961. | Jan Lindström | 2014-01-25 | 1 | -743/+5254 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | merge with MariaDB 5.6 bzr merge lp:maria --rtag:mariadb-10.0.6 | Seppo Jaakola | 2013-12-04 | 1 | -2/+3 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| | * | | | | | | | | | | | | | | | | | | | | Initial merge result with mariaDB 10: lp:maria | Seppo Jaakola | 2013-07-13 | 1 | -0/+4 |