summaryrefslogtreecommitdiff
path: root/scripts
Commit message (Expand)AuthorAgeFilesLines
* Merge 10.3 into 10.4Marko Mäkelä2019-01-251-3/+0
|\
| * MDEV-18372: Minor MDEV-17973-related merge issue to 10.3Geoff Montee2019-01-241-3/+0
* | Merge 10.3 into 10.4Marko Mäkelä2019-01-243-20/+108
|\ \ | |/
| * Merge 10.2 into 10.3Marko Mäkelä2019-01-241-6/+71
| |\
| | * Merge 10.1 into 10.2Marko Mäkelä2019-01-231-8/+70
| | |\
| | | * MDEV-17973: Don't overwrite xtrabackup-v2/mariabackup SST logs by defaultGeoff Montee2019-01-211-8/+70
| * | | Merge pull request #1120 from tempesta-tech/sysprg/MDEV-17835v2Jan Lindström2019-01-233-14/+37
| |\ \ \
| | * | | MDEV-17835: Remove wsrep-sst-method=xtrabackupJulius Goryavsky2019-01-223-14/+37
* | | | | Galera4Brave Galera Crew2019-01-234-8/+20
* | | | | Merge 10.3 into 10.4Marko Mäkelä2019-01-081-6/+15
|\ \ \ \ \ | |/ / / /
| * | | | Merge 10.2 into 10.3Marko Mäkelä2019-01-081-6/+15
| |\ \ \ \ | | |/ / / | |/| / / | | |/ /
| | * | Merge pull request #929 from angeloudy/fix-broken-thingJan Lindström2019-01-041-6/+15
| | |\ \
| | | * | Use absolute path for mariabackup binaryTao ZHOU2019-01-021-1/+1
| | | * | use `ps -p` instead of `ps --pid` Tao ZHOU2018-11-291-3/+2
| | | * | Make mariabackup.sh compatible on FreeBSDangeloudy2018-11-151-2/+12
* | | | | Merge 10.3 into 10.4Marko Mäkelä2019-01-063-1954/+0
|\ \ \ \ \ | |/ / / /
| * | | | Merge pull request #1029 from tempesta-tech/sysprg/MDEV-17835Jan Lindström2018-12-183-1954/+0
| |\ \ \ \
| | * | | | DEV-17835: Remove wsrep-sst-method=xtrabackupJulius Goryavsky2018-12-173-1954/+0
* | | | | | Merge 10.3 into 10.4Marko Mäkelä2018-12-181-3/+27
|\ \ \ \ \ \ | |/ / / / /
| * | | | | Merge pull request #1030 from tempesta-tech/sysprg/MDEV-17848Jan Lindström2018-12-171-3/+27
| |\ \ \ \ \
| | * | | | | MDEV-17848: Galera test failure on galera_sst_xtrabackup-v2[_data_dir]Julius Goryavsky2018-12-121-3/+27
| | |/ / / /
* | | | | | Merge 10.3 into 10.4Marko Mäkelä2018-12-131-9/+10
|\ \ \ \ \ \ | |/ / / / /
| * | | | | Merge 10.2 into 10.3Marko Mäkelä2018-12-131-9/+10
| |\ \ \ \ \ | | |/ / / / | |/| / / / | | |/ / /
| | * | | Merge 10.1 into 10.2Marko Mäkelä2018-12-131-9/+10
| | |\ \ \ | | | |/ / | | |/| / | | | |/
| | | * Merge 10.0 into 10.1Marko Mäkelä2018-12-131-9/+10
| | | |\
| | | | * Merge branch '5.5' into 10.0Sergei Golubchik2018-12-121-9/+10
| | | | |\
| | | | | * Added Master_Host to the Replication informationfran2018-11-161-9/+10
* | | | | | MDEV-17658 change the structure of mysql.user tableSergei Golubchik2018-12-127-35/+141
* | | | | | MDEV-16991 Rounding vs truncation for TIME, DATETIME, TIMESTAMPbb-10.4-mdev16991Alexander Barkov2018-11-262-4/+6
* | | | | | Merge 10.3 into 10.4Marko Mäkelä2018-11-191-1/+1
|\ \ \ \ \ \ | |/ / / / /
| * | | | | MDEV-17379: galera_new_cluster throws error in 10.3.10Jan Lindström2018-11-091-1/+1
* | | | | | Merge 10.3 into 10.4Marko Mäkelä2018-11-061-7/+4
|\ \ \ \ \ \ | |/ / / / /
| * | | | | Merge 10.2 into 10.3Marko Mäkelä2018-11-061-7/+4
| |\ \ \ \ \ | | |/ / / /
| | * | | | Merge 10.1 into 10.2Marko Mäkelä2018-11-061-7/+4
| | |\ \ \ \ | | | |/ / /
| | | * | | Merge branch '10.0' into 10.1Sergei Golubchik2018-10-301-7/+4
| | | |\ \ \ | | | | |/ /
| | | | * | Merge branch '5.5' into 10.0Sergei Golubchik2018-10-271-7/+4
| | | | |\ \ | | | | | |/
| | | | | * MDEV-13912 mysql_upgrade: case (in)sensitivity for stored proceduresSergei Golubchik2018-10-191-5/+5
* | | | | | Merge 10.3 into 10.4Marko Mäkelä2018-10-054-12/+87
|\ \ \ \ \ \ | |/ / / / /
| * | | | | Merge branch '10.2' into 10.3Sergei Golubchik2018-09-284-12/+87
| |\ \ \ \ \ | | |/ / / /
| | * | | | Merge branch '10.1' into 10.2Sergei Golubchik2018-09-241-3/+12
| | |\ \ \ \ | | | |/ / /
| | | * | | MDEV-17173: correct parsing of 12.13.14.15:4444/xtrabackup_sst leaving LSN/SS...Daniel Black2018-09-131-3/+12
| | * | | | Merge branch '10.1' into 10.2Oleksandr Byelkin2018-09-145-10/+76
| | |\ \ \ \ | | | |/ / /
| | | * | | Merge branch '10.0-galera' into 10.1Sergei Golubchik2018-09-071-3/+9
| | | |\ \ \
| | | | * | | Also include InnoDB undo tablespaces in rsync sstVasil Dimov2018-08-031-0/+1
| | | | * | | Put one filter per line in wsrep_sst_rsync.shVasil Dimov2018-08-031-2/+8
| | | | * | | Merge tag 'mariadb-10.0.36' into 10.0-galeraJan Lindström2018-08-025-23/+40
| | | | |\ \ \
| | | | * \ \ \ Merge pull request #645 from grooverdan/10.0-wsrep_sst_common_bashismJan Lindström2018-07-191-1/+1
| | | | |\ \ \ \
| | | | | * | | | wsrep_sst_common: fix per shellcheckDaniel Black2018-03-071-1/+1
| | | | * | | | | fix galera sst testsSergei Golubchik2018-06-151-3/+2
| | | * | | | | | Merge branch '11.0' into 10.1Oleksandr Byelkin2018-09-061-1/+1
| | | |\ \ \ \ \ \ | | | | | |_|_|/ / | | | | |/| | | |