summaryrefslogtreecommitdiff
path: root/extra
Commit message (Expand)AuthorAgeFilesLines
* MDEV-10332 support for OpenSSL 1.1 and LibreSSLGeorg Richter2017-05-091-0/+10
* Merge branch '10.1' into 10.2Sergei Golubchik2017-05-091-1/+1
|\
| * Merge branch '10.0' into 10.1Sergei Golubchik2017-05-081-1/+1
| |\
| | * Merge branch '5.5' into 10.0Sergei Golubchik2017-05-081-1/+1
| | |\
| | | * mysqld_safe_help - remove warningmariadb-5.5.56Daniel Black2017-04-301-1/+1
* | | | Merge 10.1 into 10.2Marko Mäkelä2017-05-0663-0/+26361
|\ \ \ \ | |/ / /
| * | | compiler warningsSergei Golubchik2017-04-274-8/+12
| * | | test failureSergei Golubchik2017-04-271-1/+1
| * | | mariabackup - do not extend innodb tablespaces in prepare, unlessVladislav Vaintroub2017-04-271-0/+4
| * | | Xtrabackup 2.3.8Vladislav Vaintroub2017-04-2727-420/+2354
| * | | Make Ninja generator happy with BUILD_BYPRODUCTS.Vladislav Vaintroub2017-04-271-4/+13
| * | | MDEV-9566 Port Percona Xtrabackup to MariaDB as mariabackupVladislav Vaintroub2017-04-2737-3163/+946
| * | | MDEV-9566 Add Percona Xtrabackup 2.3.7Vladislav Vaintroub2017-04-2755-0/+26627
| * | | MDEV-12253: Buffer pool blocks are accessed after they have been freedJan Lindström2017-04-261-2/+6
| * | | Merge 10.0 into 10.1Marko Mäkelä2017-04-211-26/+53
| |\ \ \ | | |/ /
| | * | MDEV-12488 Remove type mismatch in InnoDB printf-like callsMarko Mäkelä2017-04-211-10/+24
* | | | InnoDB cleanup: remove a bunch of #ifdef UNIV_INNOCHECKSUMSergei Golubchik2017-04-301-4/+1
* | | | Merge branch '10.1' into 10.2Sergei Golubchik2017-03-304-24/+13
|\ \ \ \ | |/ / /
| * | | Fix InnoDB/XtraDB compilation warnings on 32-bit builds.Marko Mäkelä2017-03-091-1/+2
| * | | spelling fixesklemens2017-03-072-2/+2
| * | | Merge 10.0 into 10.1Marko Mäkelä2017-03-031-1/+0
| |\ \ \ | | |/ /
| | * | Fixed compiler warningsMonty2017-02-281-1/+0
* | | | MDEV-12271 Port MySQL 8.0 Bug#23150562 REMOVE UNIV_MUST_NOT_INLINE AND UNIV_N...Marko Mäkelä2017-03-171-6/+0
* | | | Fix many -Wconversion warnings.Marko Mäkelä2017-03-072-6/+8
* | | | Merge branch '10.1' into 10.2Sergei Golubchik2017-02-102-0/+80
|\ \ \ \ | |/ / /
| * | | Merge branch '10.0' into 10.1Vicențiu Ciorbaru2017-01-162-0/+80
| |\ \ \ | | |/ /
| | * | Merge remote-tracking branch 'origin/5.5' into 10.0vicentiu2017-01-062-0/+80
| | |\ \ | | | |/
| | | * Numerous issues in mysqld_safeSergei Golubchik2016-12-222-0/+80
* | | | MDEV-10942: innodb_zip.innochecksum_3, innodb_zip.innochecksum_2Jan Lindström2017-01-251-2/+0
* | | | MDEV-11879: Duplicate option innochecksum -l (--log, --leaf)Jan Lindström2017-01-241-2/+2
* | | | MDEV-11684: post-10.1-merge fixesJan Lindström2017-01-032-4/+39
* | | | Merge branch '10.1' into 10.2Sergei Golubchik2016-12-2912-124/+277
|\ \ \ \ | |/ / /
| * | | Merge branch '10.0-galera' into 10.1Sergei Golubchik2016-11-0213-129/+327
| |\ \ \
| | * \ \ Merge tag 'mariadb-10.0.28' into 10.0-galeraNirbhay Choubey2016-10-2813-129/+327
| | |\ \ \ | | | |/ /
| | | * | Merge branch 'merge/merge-xtradb-5.6' into 10.0Sergei Golubchik2016-10-251-2/+2
| | | * | Merge branch '5.5' into 10.0Sergei Golubchik2016-10-2511-122/+274
| | | |\ \ | | | | |/
| | | | * Merge branch 'mysql/5.5' into 5.5Sergei Golubchik2016-10-1311-122/+274
| | | | |\
| | | | | * Bug #24740291: YASSL UPDATE TO 2.4.2mysql-5.5.53Robert Golebiowski2016-09-2811-122/+274
| | | | | * Bug#21977380 - POSSIBLE BUFFER OVERFLOW ISSUESShishir Jaiswal2016-05-161-2/+2
| | | * | | MDEV-11127 : Fix innochecksum to work with large files on Windows.Vladislav Vaintroub2016-10-251-5/+50
| | | * | | Upstream patch from Debian Bug 838557Kristian Nielsen2016-10-211-2/+3
| | * | | | Merge branch '10.0' into 10.0-galeraNirbhay Choubey2016-08-241-1/+1
| | |\ \ \ \ | | | |/ / /
| | * | | | Merge tag 'mariadb-10.0.26' into 10.0-galeraNirbhay Choubey2016-06-242-4/+6
| | |\ \ \ \
| | * \ \ \ \ Merge branch '10.0' into 10.0-galeraNirbhay Choubey2016-04-2910-36/+86
| | |\ \ \ \ \
| | * \ \ \ \ \ Merge tag 'mariadb-10.0.24' into 10.0-galeraNirbhay Choubey2016-02-236-15/+40
| | |\ \ \ \ \ \
| | * \ \ \ \ \ \ Merge tag 'mariadb-10.0.23' into 10.0-galeraNirbhay Choubey2015-12-191-43/+26
| | |\ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ Merge tag 'mariadb-10.0.22' into 10.0-galeraNirbhay Choubey2015-10-3111-7/+93
| | |\ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ Merge tag 'mariadb-10.0.20' into 10.0-galeraNirbhay Choubey2015-06-211-6/+3
| | |\ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ Merge branch '10.0' into 10.0-galeraNirbhay Choubey2015-02-1811-20/+342
| | |\ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ maria-10.0.16 mergeNirbhay Choubey2015-01-268-334/+506
| | |\ \ \ \ \ \ \ \ \ \ \