summaryrefslogtreecommitdiff
path: root/extra
Commit message (Expand)AuthorAgeFilesLines
* Compile mariabackup with its own copy of net_serv.ccSergei Golubchik2017-08-231-0/+1
* fix compile errorsVladislav Vaintroub2017-08-231-1/+0
* Merge remote-tracking branch 'origin/bb-10.2-ext' into 10.3Marko Mäkelä2017-08-092-461/+504
|\
| * Merge 10.2 into bb-10.2-extMarko Mäkelä2017-08-082-461/+504
| |\
| | * MDEV-11939: innochecksum mistakes a file for an encrypted one (page 0 invalid)Jan Lindström2017-08-082-461/+504
* | | Merge remote-tracking branch 'origin/bb-10.2-ext' into 10.3Alexander Barkov2017-07-191-2/+2
|\ \ \ | |/ /
| * | Merge remote-tracking branch 'origin/10.2' into bb-10.2-extAlexander Barkov2017-07-191-2/+2
| |\ \ | | |/
| | * MDEV-13332 mariabackup from 10.2.x crashes with --ftwrl-* optionsVladislav Vaintroub2017-07-171-2/+2
* | | Merge bb-10.2-ext into 10.3Marko Mäkelä2017-07-0716-2170/+1343
|\ \ \ | |/ /
| * | Merge 10.2 into bb-10.2-extMarko Mäkelä2017-07-071-1/+0
| |\ \ | | |/
| | * Remove a reference to a non-existent include directoryMarko Mäkelä2017-07-071-1/+0
| * | Merge remote-tracking branch 'origin/10.2' into bb-10.2-extAlexander Barkov2017-07-0716-2170/+1344
| |\ \ | | |/
| | * Mariabackup: Copy all of the redo log correctlyMarko Mäkelä2017-07-061-112/+62
| | * Mariabackup: Remove unused parameters and fix some memory leaksMarko Mäkelä2017-07-064-35/+19
| | * Merge branch '10.1' into 10.2Sergei Golubchik2017-07-052-21/+20
| | |\
| | | * Mariabackup: Clean up xtrabackup optionsMarko Mäkelä2017-06-302-24/+1
| | | * Cherrypick Perconas fix for leaking descriptors with new xbstream.Vladislav Vaintroub2017-06-221-0/+4
| | | * MDEV-12709 : mariabackup - during backup phase read some innodb parameterVladislav Vaintroub2017-06-191-21/+16
| | * | MDEV-13105 InnoDB fails to load a table with PAGE_COMPRESSION_LEVEL after upg...Marko Mäkelä2017-07-051-1/+1
| | * | MDEV-12548 Initial implementation of Mariabackup for MariaDB 10.2Marko Mäkelä2017-07-0515-2055/+1296
* | | | Remove XtraDBMarko Mäkelä2017-06-212-2/+2
* | | | Merge bb-10.2-ext into 10.3Marko Mäkelä2017-06-1926-4130/+180
|\ \ \ \ | |/ / /
| * | | Merge 10.2 into bb-10.2-extMarko Mäkelä2017-06-1918-3702/+56
| |\ \ \ | | |/ /
| | * | Merge 10.1 into 10.2Marko Mäkelä2017-06-1918-3702/+56
| | |\ \ | | | |/
| | | * Mariabackup: Remove the --stats optionMarko Mäkelä2017-06-193-454/+3
| | | * Mariabackup: Remove support for .xbcrypt filesMarko Mäkelä2017-06-1916-3015/+21
| | | * Mariabackup: Remove the options --compact --rebuild-indexes --rebuild-threadsMarko Mäkelä2017-06-193-42/+2
| | | * Mariabackup: Remove the options --to-archived-lsn --innodb-log-arch-dirMarko Mäkelä2017-06-191-192/+31
| * | | Merge remote-tracking branch 'origin/10.2' into bb-10.2-extAlexander Barkov2017-06-1513-433/+129
| |\ \ \ | | |/ /
| | * | Merge 10.1 into 10.2Marko Mäkelä2017-06-121-18/+6
| | |\ \ | | | |/
| | | * Merge 10.0 into 10.1Marko Mäkelä2017-06-121-18/+6
| | | |\
| | * | \ Merge 10.1 into 10.2Marko Mäkelä2017-06-082-11/+9
| | |\ \ \ | | | |/ /
| | | * | MDEV-12113: install_db shows corruption for rest encryption with innodb_data_...Jan Lindström2017-06-012-11/+9
| | * | | Remove traces of multiple InnoDB redo logsMarko Mäkelä2017-06-063-233/+77
| | * | | Fix some integer type mismatch in innochecksumMarko Mäkelä2017-05-261-5/+9
| | * | | Merge 10.1 into 10.2Marko Mäkelä2017-05-2310-164/+22
| | |\ \ \ | | | |/ /
| | | * | MDEV-12832 : remove libarchive support from mariabackup,Vladislav Vaintroub2017-05-214-148/+6
| | | * | Merge 10.0 into 10.1Marko Mäkelä2017-05-207-16/+16
| | | |\ \ | | | | |/
| | * | | Merge 10.1 into 10.2Marko Mäkelä2017-05-223-2/+6
| | |\ \ \ | | | |/ /
| | | * | Merge 10.0 into 10.1Marko Mäkelä2017-05-191-0/+3
| | | |\ \ | | | | |/
| | | | * Silence bogus GCC 7 warnings -Wimplicit-fallthroughMarko Mäkelä2017-05-171-0/+1
| | | * | MDEV-12810 - force static build of crc libraryVladislav Vaintroub2017-05-181-1/+1
| | | * | MDEV-12814 mariabackup : don't try io throttling in copy-backVladislav Vaintroub2017-05-181-1/+1
| | | * | Silence bogus GCC 7 warnings -Wimplicit-fallthroughMarko Mäkelä2017-05-171-0/+1
* | | | | Remove deprecated InnoDB file format parametersMarko Mäkelä2017-06-021-3/+0
|/ / / /
* | | | Merge tag 'mariadb-10.2.6' into bb-10.2-extAlexander Barkov2017-05-2664-0/+26371
|\ \ \ \ | |/ / /
| * | | 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
| | | |\