Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | MDEV-10332 support for OpenSSL 1.1 and LibreSSL | Georg Richter | 2017-05-09 | 1 | -0/+10 |
* | Merge branch '10.1' into 10.2 | Sergei Golubchik | 2017-05-09 | 1 | -1/+1 |
|\ | |||||
| * | Merge branch '10.0' into 10.1 | Sergei Golubchik | 2017-05-08 | 1 | -1/+1 |
| |\ | |||||
| | * | Merge branch '5.5' into 10.0 | Sergei Golubchik | 2017-05-08 | 1 | -1/+1 |
| | |\ | |||||
| | | * | mysqld_safe_help - remove warningmariadb-5.5.56 | Daniel Black | 2017-04-30 | 1 | -1/+1 |
* | | | | Merge 10.1 into 10.2 | Marko Mäkelä | 2017-05-06 | 63 | -0/+26361 |
|\ \ \ \ | |/ / / | |||||
| * | | | compiler warnings | Sergei Golubchik | 2017-04-27 | 4 | -8/+12 |
| * | | | test failure | Sergei Golubchik | 2017-04-27 | 1 | -1/+1 |
| * | | | mariabackup - do not extend innodb tablespaces in prepare, unless | Vladislav Vaintroub | 2017-04-27 | 1 | -0/+4 |
| * | | | Xtrabackup 2.3.8 | Vladislav Vaintroub | 2017-04-27 | 27 | -420/+2354 |
| * | | | Make Ninja generator happy with BUILD_BYPRODUCTS. | Vladislav Vaintroub | 2017-04-27 | 1 | -4/+13 |
| * | | | MDEV-9566 Port Percona Xtrabackup to MariaDB as mariabackup | Vladislav Vaintroub | 2017-04-27 | 37 | -3163/+946 |
| * | | | MDEV-9566 Add Percona Xtrabackup 2.3.7 | Vladislav Vaintroub | 2017-04-27 | 55 | -0/+26627 |
| * | | | MDEV-12253: Buffer pool blocks are accessed after they have been freed | Jan Lindström | 2017-04-26 | 1 | -2/+6 |
| * | | | Merge 10.0 into 10.1 | Marko Mäkelä | 2017-04-21 | 1 | -26/+53 |
| |\ \ \ | | |/ / | |||||
| | * | | MDEV-12488 Remove type mismatch in InnoDB printf-like calls | Marko Mäkelä | 2017-04-21 | 1 | -10/+24 |
* | | | | InnoDB cleanup: remove a bunch of #ifdef UNIV_INNOCHECKSUM | Sergei Golubchik | 2017-04-30 | 1 | -4/+1 |
* | | | | Merge branch '10.1' into 10.2 | Sergei Golubchik | 2017-03-30 | 4 | -24/+13 |
|\ \ \ \ | |/ / / | |||||
| * | | | Fix InnoDB/XtraDB compilation warnings on 32-bit builds. | Marko Mäkelä | 2017-03-09 | 1 | -1/+2 |
| * | | | spelling fixes | klemens | 2017-03-07 | 2 | -2/+2 |
| * | | | Merge 10.0 into 10.1 | Marko Mäkelä | 2017-03-03 | 1 | -1/+0 |
| |\ \ \ | | |/ / | |||||
| | * | | Fixed compiler warnings | Monty | 2017-02-28 | 1 | -1/+0 |
* | | | | MDEV-12271 Port MySQL 8.0 Bug#23150562 REMOVE UNIV_MUST_NOT_INLINE AND UNIV_N... | Marko Mäkelä | 2017-03-17 | 1 | -6/+0 |
* | | | | Fix many -Wconversion warnings. | Marko Mäkelä | 2017-03-07 | 2 | -6/+8 |
* | | | | Merge branch '10.1' into 10.2 | Sergei Golubchik | 2017-02-10 | 2 | -0/+80 |
|\ \ \ \ | |/ / / | |||||
| * | | | Merge branch '10.0' into 10.1 | Vicențiu Ciorbaru | 2017-01-16 | 2 | -0/+80 |
| |\ \ \ | | |/ / | |||||
| | * | | Merge remote-tracking branch 'origin/5.5' into 10.0 | vicentiu | 2017-01-06 | 2 | -0/+80 |
| | |\ \ | | | |/ | |||||
| | | * | Numerous issues in mysqld_safe | Sergei Golubchik | 2016-12-22 | 2 | -0/+80 |
* | | | | MDEV-10942: innodb_zip.innochecksum_3, innodb_zip.innochecksum_2 | Jan Lindström | 2017-01-25 | 1 | -2/+0 |
* | | | | MDEV-11879: Duplicate option innochecksum -l (--log, --leaf) | Jan Lindström | 2017-01-24 | 1 | -2/+2 |
* | | | | MDEV-11684: post-10.1-merge fixes | Jan Lindström | 2017-01-03 | 2 | -4/+39 |
* | | | | Merge branch '10.1' into 10.2 | Sergei Golubchik | 2016-12-29 | 12 | -124/+277 |
|\ \ \ \ | |/ / / | |||||
| * | | | Merge branch '10.0-galera' into 10.1 | Sergei Golubchik | 2016-11-02 | 13 | -129/+327 |
| |\ \ \ | |||||
| | * \ \ | Merge tag 'mariadb-10.0.28' into 10.0-galera | Nirbhay Choubey | 2016-10-28 | 13 | -129/+327 |
| | |\ \ \ | | | |/ / | |||||
| | | * | | Merge branch 'merge/merge-xtradb-5.6' into 10.0 | Sergei Golubchik | 2016-10-25 | 1 | -2/+2 |
| | | * | | Merge branch '5.5' into 10.0 | Sergei Golubchik | 2016-10-25 | 11 | -122/+274 |
| | | |\ \ | | | | |/ | |||||
| | | | * | Merge branch 'mysql/5.5' into 5.5 | Sergei Golubchik | 2016-10-13 | 11 | -122/+274 |
| | | | |\ | |||||
| | | | | * | Bug #24740291: YASSL UPDATE TO 2.4.2mysql-5.5.53 | Robert Golebiowski | 2016-09-28 | 11 | -122/+274 |
| | | | | * | Bug#21977380 - POSSIBLE BUFFER OVERFLOW ISSUES | Shishir Jaiswal | 2016-05-16 | 1 | -2/+2 |
| | | * | | | MDEV-11127 : Fix innochecksum to work with large files on Windows. | Vladislav Vaintroub | 2016-10-25 | 1 | -5/+50 |
| | | * | | | Upstream patch from Debian Bug 838557 | Kristian Nielsen | 2016-10-21 | 1 | -2/+3 |
| | * | | | | Merge branch '10.0' into 10.0-galera | Nirbhay Choubey | 2016-08-24 | 1 | -1/+1 |
| | |\ \ \ \ | | | |/ / / | |||||
| | * | | | | Merge tag 'mariadb-10.0.26' into 10.0-galera | Nirbhay Choubey | 2016-06-24 | 2 | -4/+6 |
| | |\ \ \ \ | |||||
| | * \ \ \ \ | Merge branch '10.0' into 10.0-galera | Nirbhay Choubey | 2016-04-29 | 10 | -36/+86 |
| | |\ \ \ \ \ | |||||
| | * \ \ \ \ \ | Merge tag 'mariadb-10.0.24' into 10.0-galera | Nirbhay Choubey | 2016-02-23 | 6 | -15/+40 |
| | |\ \ \ \ \ \ | |||||
| | * \ \ \ \ \ \ | Merge tag 'mariadb-10.0.23' into 10.0-galera | Nirbhay Choubey | 2015-12-19 | 1 | -43/+26 |
| | |\ \ \ \ \ \ \ | |||||
| | * \ \ \ \ \ \ \ | Merge tag 'mariadb-10.0.22' into 10.0-galera | Nirbhay Choubey | 2015-10-31 | 11 | -7/+93 |
| | |\ \ \ \ \ \ \ \ | |||||
| | * \ \ \ \ \ \ \ \ | Merge tag 'mariadb-10.0.20' into 10.0-galera | Nirbhay Choubey | 2015-06-21 | 1 | -6/+3 |
| | |\ \ \ \ \ \ \ \ \ | |||||
| | * \ \ \ \ \ \ \ \ \ | Merge branch '10.0' into 10.0-galera | Nirbhay Choubey | 2015-02-18 | 11 | -20/+342 |
| | |\ \ \ \ \ \ \ \ \ \ | |||||
| | * \ \ \ \ \ \ \ \ \ \ | maria-10.0.16 merge | Nirbhay Choubey | 2015-01-26 | 8 | -334/+506 |
| | |\ \ \ \ \ \ \ \ \ \ \ |