summaryrefslogtreecommitdiff
path: root/extra
Commit message (Expand)AuthorAgeFilesLines
* Merge remote-tracking branch 'origin/10.2' into bb-10.2-extMonty2017-11-092-16/+21
|\
| * Merge 10.1 into 10.2Marko Mäkelä2017-11-081-1/+1
| |\
| * \ Merge 10.1 into 10.2Marko Mäkelä2017-11-071-15/+20
| |\ \ | | |/
| | * MDEV-13560 Copy all innodb undo tablespaces from the backup directory to dest...Vladislav Vaintroub2017-11-031-15/+17
* | | Merge remote-tracking branch 'origin/10.2' into bb-10.2-extAlexander Barkov2017-10-3013-164/+194
|\ \ \ | |/ /
| * | Merge 10.1 into 10.2Marko Mäkelä2017-10-257-142/+150
| |\ \ | | |/
| | * MDEV-13496 Use "mariabackup" rather than "xtrabackup" in console outputMarko Mäkelä2017-10-253-23/+22
| | * MDEV-13496 Use "mariabackup" rather than "xtrabackup" in console outputVladislav Vaintroub2017-10-233-164/+158
| | * MDEV-14102 restore --remove-original options for mariabackupVladislav Vaintroub2017-10-231-0/+5
| * | Merge branch '10.1' into 10.2Sergei Golubchik2017-10-247-22/+44
| |\ \ | | |/
| | * Various compier warningsSergei Golubchik2017-10-222-4/+4
| | * Merge branch '10.0' into 10.1Sergei Golubchik2017-10-226-17/+39
| | |\
| | | * Merge branch '5.5' into 10.0Sergei Golubchik2017-10-186-17/+39
| | | |\
| | | | * Merge branch 'mysql/5.5' into 5.5Sergei Golubchik2017-10-174-8/+24
| | | | |\
| | | | | * Bug#26482173: TLS CIPHER NEGOTIATION INCORRECTLY MATCHES ONArun Kuruvila2017-08-247-164/+182
| | | | | * Bug #24740291: YASSL UPDATE TO 2.4.2Robert Golebiowski2016-09-2711-122/+274
| | | | * | MDEV-13459 Warnings, when compiling with gcc-7.xSergei Golubchik2017-10-172-8/+14
* | | | | | Merge remote-tracking branch 'origin/10.2' into bb-10.2-extAlexander Barkov2017-10-183-15/+25
|\ \ \ \ \ \ | |/ / / / /
| * | | | | mariabackup: Properly call os_thread_exit() with detach=trueMarko Mäkelä2017-10-131-3/+3
| * | | | | MDEV-13311 Presence of old logs in 10.2.7 will corrupt restored instance (cha...Marko Mäkelä2017-10-102-2/+4
| * | | | | MDEV-13822 mariabackup incremental prepare incorrectly sets file size.Vladislav Vaintroub2017-10-101-7/+16
| * | | | | Innodb : Refactor os_file_set_size() to be compatible 10.1Vladislav Vaintroub2017-10-101-2/+1
| * | | | | merge 10.1->10.2Vladislav Vaintroub2017-10-071-1/+1
| |\ \ \ \ \ | | |/ / / /
| | * | | | MDEV-13310 Preparing an incremental backup twice can corrupt dataVladislav Vaintroub2017-10-071-1/+4
| | * | | | MDEV-13798 - fix incorrect alignment of the buffer in incremental backupVladislav Vaintroub2017-10-071-1/+1
| | * | | | MDEV-13822 mariabackup incremental prepare incorrectly sets file size.Vladislav Vaintroub2017-10-071-52/+11
* | | | | | Merge remote-tracking branch 'origin/10.2' into bb-10.2-extAlexander Barkov2017-10-024-13/+13
|\ \ \ \ \ \ | |/ / / / /
| * | | | | MDEV-13384 - misc Windows warnings fixedVladislav Vaintroub2017-09-282-3/+3
| * | | | | MDEV-13844 : Fix Windows warnings. Fix DBUG_PRINT.Vladislav Vaintroub2017-09-283-10/+10
* | | | | | Merge 10.2 into bb-10.2-extMarko Mäkelä2017-09-205-12/+3
|\ \ \ \ \ \ | |/ / / / /
| * | | | | Merge branch '10.2' of github.com:MariaDB/server into 10.2Vicențiu Ciorbaru2017-09-201-1/+1
| |\ \ \ \ \
| | * | | | | Fix a typoMarko Mäkelä2017-09-201-1/+1
| * | | | | | Merge branch '10.1' into 10.2Vicențiu Ciorbaru2017-09-192-9/+0
| |\ \ \ \ \ \ | | |/ / / / / | |/| / / / / | | |/ / / /
| | * | | | Merge branch '10.0' into 10.1Vicențiu Ciorbaru2017-09-192-9/+0
| | |\ \ \ \ | | | |/ / /
| | | * | | Build improvements and cleanups.Vladislav Vaintroub2017-09-082-9/+0
| | * | | | Fix compilation in mariabackupVladislav Vaintroub2017-09-163-3/+4
| | * | | | MDEV-13821 : mariabackup sometimes could lose ib_logf(FATAL) messages,Vladislav Vaintroub2017-09-161-0/+6
| * | | | | MDEV-12763 10.2 uses deprecated openssl 1.0 apis even with 1.1Sergei Golubchik2017-09-182-2/+2
* | | | | | Merge 10.2 into bb-10.2-extMarko Mäkelä2017-09-174-41/+23
|\ \ \ \ \ \ | |/ / / / /
| * | | | | MDEV-13802 mariabackup --lock-ddl-per-table fails when table names contain ba...Vladislav Vaintroub2017-09-152-31/+16
| * | | | | mariabackup : Fix enumerate_ibd_files() to include .islVladislav Vaintroub2017-09-153-13/+10
* | | | | | Merge 10.2 into bb-10.2-extMarko Mäkelä2017-09-141-25/+15
|\ \ \ \ \ \ | |/ / / / /
| * | | | | Follow-up to MDEV-13563 mariabackup --lock-ddl-per-tableMarko Mäkelä2017-09-141-25/+15
* | | | | | Merge remote-tracking branch 'origin/10.2' into bb-10.2-extAlexander Barkov2017-09-133-11/+136
|\ \ \ \ \ \ | |/ / / / /
| * | | | | MDEV-13318 Crash recovery failure after the server is killed during innodb_en...Marko Mäkelä2017-09-121-10/+17
| * | | | | MDEV-13563 lock DDL for mariabackup in 10.2Vladislav Vaintroub2017-09-123-1/+119
* | | | | | Merge 10.2 into bb-10.2-extMarko Mäkelä2017-09-081-528/+172
|\ \ \ \ \ \ | |/ / / / /
| * | | | | Windows : Fix MTR's misuse of servers --console parameterVladislav Vaintroub2017-09-081-3/+2
| * | | | | MDEV-13466 Implement --export option for MariaDB BackupVladislav Vaintroub2017-09-071-527/+172
* | | | | | Merge 10.2 into bb-10.2-extMarko Mäkelä2017-09-072-2/+2
|\ \ \ \ \ \ | |/ / / / /