Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Remove XtraDB | Marko Mäkelä | 2017-06-21 | 1 | -746/+0 |
* | Merge remote-tracking branch 'origin/10.2' into bb-10.2-ext | Alexander Barkov | 2017-06-15 | 1 | -1/+1 |
|\ | |||||
| * | Merge 10.0 into 10.1 | Marko Mäkelä | 2017-05-19 | 1 | -1/+1 |
| |\ | |||||
| | * | Fix some __attribute__((nonnull)) misuse | Marko Mäkelä | 2017-05-18 | 1 | -1/+1 |
* | | | Changing field::field_name and Item::name to LEX_CSTRING | Monty | 2017-04-23 | 1 | -1/+1 |
* | | | Added "const" to new data for handler::update_row() | Michael Widenius | 2017-04-18 | 1 | -1/+1 |
|/ / | |||||
* | | MDEV-12345 Performance : replace calls to clock() inside trx_start_low() by T... | Vladislav Vaintroub | 2017-03-23 | 1 | -0/+9 |
* | | Merge 10.0 into 10.1 | Marko Mäkelä | 2017-03-09 | 1 | -0/+2 |
|\ \ | |/ | |||||
| * | Merge branch 'merge-xtradb-5.6' into 10.0 | Vicențiu Ciorbaru | 2017-03-05 | 1 | -0/+2 |
| |\ | |||||
| | * | 5.6.35-80.0 | Vicențiu Ciorbaru | 2017-03-04 | 1 | -0/+2 |
* | | | Merge 10.0 into 10.1 | Marko Mäkelä | 2017-01-04 | 1 | -37/+1 |
|\ \ \ | |/ / | |||||
| * | | MDEV-11694 InnoDB tries to create unused table SYS_ZIP_DICTbb-10.0-mdev-11694 | Marko Mäkelä | 2017-01-03 | 1 | -37/+1 |
* | | | Merge branch '10.0-galera' into 10.1 | Sergei Golubchik | 2016-11-02 | 1 | -0/+37 |
|\ \ \ | |||||
| * \ \ | Merge tag 'mariadb-10.0.28' into 10.0-galera | Nirbhay Choubey | 2016-10-28 | 1 | -0/+37 |
| |\ \ \ | | |/ / | |||||
| | * | | Merge branch 'merge/merge-xtradb-5.6' into 10.0 | Sergei Golubchik | 2016-10-25 | 1 | -0/+37 |
| | |\ \ | | | |/ | |||||
| | | * | 5.6.33-79.0 | Sergei Golubchik | 2016-10-25 | 1 | -0/+37 |
| * | | | Merge branch '10.0' into 10.0-galera | Nirbhay Choubey | 2016-08-24 | 1 | -9/+9 |
| |\ \ \ | | |/ / | |||||
| * | | | Merge branch '10.0' into 10.0-galera | Nirbhay Choubey | 2016-04-29 | 1 | -0/+37 |
| |\ \ \ | |||||
| * \ \ \ | bzr merge -rtag:mariadb-10.0.15 maria/10.0 | Nirbhay Choubey | 2014-12-05 | 1 | -7/+0 |
| |\ \ \ \ | |||||
| * \ \ \ \ | bzr merge -rtag:mariadb-10.0.14 maria/10.0/ | Nirbhay Choubey | 2014-09-28 | 1 | -1/+0 |
| |\ \ \ \ \ | |||||
| * | | | | | | Merging InnoDB changes to xtradb (r3783..3808). | Nirbhay Choubey | 2014-03-26 | 1 | -32/+37 |
| * | | | | | | Merge MariaDB-10.0.7 revision 3961. | Jan Lindström | 2014-01-25 | 1 | -94/+335 |
| |\ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ | merge with MariaDB 5.6 bzr merge lp:maria --rtag:mariadb-10.0.6 | Seppo Jaakola | 2013-12-04 | 1 | -2/+2 |
| |\ \ \ \ \ \ \ | |||||
| * | | | | | | | | Initial merge result with mariaDB 10: lp:maria | Seppo Jaakola | 2013-07-13 | 1 | -0/+38 |
* | | | | | | | | | Merge branch '10.0' into 10.1 | Sergei Golubchik | 2016-08-25 | 1 | -9/+9 |
|\ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|/ / | |/| | | | | | | | |||||
| * | | | | | | | | Merge branch 'merge/merge-xtradb-5.6' into 10.0 | Sergei Golubchik | 2016-08-10 | 1 | -9/+9 |
| |\ \ \ \ \ \ \ \ | | |_|_|_|_|_|/ / | |/| | | | | | / | | | |_|_|_|_|/ | | |/| | | | | | |||||
| | * | | | | | | 5.6.31-77.0 | Sergei Golubchik | 2016-08-10 | 1 | -10/+10 |
* | | | | | | | | Merge branch '10.0' into 10.1 | Sergei Golubchik | 2016-05-04 | 1 | -1/+37 |
|\ \ \ \ \ \ \ \ | |/ / / / / / / | |||||
| * | | | | | | | Merge branch 'merge-xtradb-5.6' into 10.0 | Sergei Golubchik | 2016-04-26 | 1 | -0/+23 |
| |\ \ \ \ \ \ \ | | |/ / / / / / | |||||
| | * | | | | | | 5.6.29-76.2 | Sergei Golubchik | 2016-04-26 | 1 | -0/+23 |
| | * | | | | | | move to storage/xtradb | Sergei Golubchik | 2015-05-04 | 1 | -0/+644 |
| | / / / / / | |||||
| * | | | | | | MDEV-9918: [ERROR] mysqld got signal 11 during ALTER TABLE `name` COLUMN ADD | Jan Lindström | 2016-04-22 | 1 | -0/+14 |
| | |_|_|_|/ | |/| | | | | |||||
* | | | | | | MDEV-8406: Test failure on encryption.innodb-page_encryption_log_encryption i... | Jan Lindström | 2015-07-01 | 1 | -12/+12 |
* | | | | | | InnoDB/XtraDB Encryption cleanup | Jan Lindström | 2015-04-07 | 1 | -1/+1 |
* | | | | | | InnoDB/XtraDB Encryption cleanup | Jan Lindström | 2015-04-07 | 1 | -3/+2 |
* | | | | | | Push for testing of encryption | Monty | 2015-02-10 | 1 | -1/+4 |
* | | | | | | Merge branch '10.0' into bb-10.1-merge | Sergei Golubchik | 2014-12-02 | 1 | -7/+0 |
|\ \ \ \ \ \ | |/ / / / / | |||||
| * | | | | | XtraDB 5.6.21-70.0 | Sergei Golubchik | 2014-11-20 | 1 | -7/+0 |
| | |_|_|/ | |/| | | | |||||
* | | | | | Merge 10.0.14 into 10.1 | Sergei Golubchik | 2014-10-15 | 1 | -1/+0 |
|\ \ \ \ \ | |/ / / / | |||||
| * | | | | XtraDB 5.6.20-68.0 | Sergei Golubchik | 2014-09-11 | 1 | -1/+0 |
| | |_|/ | |/| | | |||||
* | | | | fixing embedded: WaaS. Wsrep as a Service. | Sergei Golubchik | 2014-10-01 | 1 | -15/+0 |
* | | | | MDEV-6247: Merge 10.0-galera to 10.1. | Jan Lindström | 2014-08-27 | 1 | -0/+41 |
|\ \ \ \ | |||||
| * | | | | MDEV-6247: Merge 10.0-galera to 10.1. | Jan Lindström | 2014-08-26 | 1 | -0/+41 |
* | | | | | MDEV-5834: Merge Kakao Defragmentation implementation to MariaDB 10.1 | Jan Lindström | 2014-08-06 | 1 | -1/+6 |
|/ / / / | |||||
* | | | | Fixed merge error on InnoDB page compression level handling. | Jan Lindström | 2014-02-03 | 1 | -0/+18 |
|/ / / | |||||
* | | | Percona-Server-5.6.14-rel62.0 merge | Sergei Golubchik | 2013-12-22 | 1 | -67/+310 |
| |/ |/| | |||||
* | | 5.5 merge and fixes for compiler/test errors | Sergei Golubchik | 2013-09-18 | 1 | -2/+2 |
|\ \ | |/ |/| | |||||
| * | Percona-Server-5.5.33-rel31.1.tar.gz | Sergei Golubchik | 2013-09-07 | 1 | -2/+2 |
* | | * move bas_ext from the handler to the handlerton | Sergei Golubchik | 2013-04-07 | 1 | -1/+0 |
* | | 5.5 merge | Sergei Golubchik | 2013-03-27 | 1 | -4/+5 |
|\ \ | |/ |