summaryrefslogtreecommitdiff
path: root/extra
Commit message (Expand)AuthorAgeFilesLines
* 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
| | |\ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ bzr merge -rtag:mariadb-10.0.15 maria/10.0Nirbhay Choubey2014-12-0539-430/+703
| | |\ \ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ \ bzr merge -rtag:mariadb-10.0.14 maria/10.0/Nirbhay Choubey2014-09-28100-45894/+0
| | |\ \ \ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ bzr merge -r4346 maria/10.0 (maria-10.0.13)Nirbhay Choubey2014-08-114-10/+11
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ bzr merge -r4209 maria/10.0.Nirbhay Choubey2014-05-2185-436/+871
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merging mariadb-10.0.10.Nirbhay Choubey2014-04-081-2/+2
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merged revision 3471, 3472 & 3473 from maria-5.5-galera.Nirbhay Choubey2014-03-281-3/+8
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | * | | | | | | | | | | | | | | | | Merged revision 3471, 3472 & 3473 from maria-5.5-galera.Nirbhay Choubey2014-03-271-3/+8
| * | | | | | | | | | | | | | | | | | | MDEV-10969: innochecksum dumps core for some .ibd files due to floating point...Jan Lindström2016-10-241-2/+10
* | | | | | | | | | | | | | | | | | | | fix build and some warningskevg2016-11-242-3/+3
* | | | | | | | | | | | | | | | | | | | Fixed compiler warnings and failing testsMonty2016-10-051-1/+4
* | | | | | | | | | | | | | | | | | | | MDEV-10727: Merge 5.7 Innochecksum with 5.6Jan Lindström2016-09-301-73/+501
* | | | | | | | | | | | | | | | | | | | Merge branch '10.2' into bb-10.2-janSergei Golubchik2016-09-1912-8/+2665
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch '10.1' into 10.2Sergei Golubchik2016-09-091-1/+1
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / / / / / / /
| | * | | | | | | | | | | | | | | | | | | Merge branch '10.0' into 10.1Sergei Golubchik2016-08-251-1/+1
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ / / | | | |/| | | | | | | | | | | | | | | | |
| | | * | | | | | | | | | | | | | | | | | Fixed compiler error and some warnings on windowsMonty2016-08-231-1/+1
| | | | |_|_|_|_|_|_|_|_|_|_|_|_|_|/ / / | | | |/| | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | crc32-vpmsum: Restore non volatile registers on zero length CRCAnton Blanchard2016-08-051-1/+0
| * | | | | | | | | | | | | | | | | | | MDEV-9872: New Power8 crc32(ieee) optimized functionsDaniel Black2016-08-059-146/+1032
| * | | | | | | | | | | | | | | | | | | MDEV-9872 - Add common optimized CRC32 function interfaceSergey Vojtovich2016-08-046-7/+1779
* | | | | | | | | | | | | | | | | | | | Merge InnoDB 5.7 from mysql-5.7.9.Jan Lindström2016-09-022-884/+1401
|/ / / / / / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | | | | Merge branch '10.1' into 10.2Sergei Golubchik2016-06-3011-38/+90
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / / / /
| * | | | | | | | | | | | | | | | | | Merge branch '10.0' into 10.1Sergei Golubchik2016-06-282-4/+6
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / / / / /
| | * | | | | | | | | | | | | | | | | Merge branch '5.5' into bb-10.0Sergei Golubchik2016-06-212-4/+6
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|_|_|_|_|_|_|_|/ / / | | |/| | | | | | | | | | | | | | / / | | | | |_|_|_|_|_|_|_|_|_|_|_|_|/ / | | | |/| | | | | | | | | | | | | |
| | | * | | | | | | | | | | | | | | Merge branch 'mysql/5.5' into 5.5Sergei Golubchik2016-06-141-2/+1
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \