summaryrefslogtreecommitdiff
path: root/scripts
Commit message (Expand)AuthorAgeFilesLines
* Merge 10.2 into 10.3Marko Mäkelä2019-05-1428-28/+28
|\
| * Merge 10.1 into 10.2Marko Mäkelä2019-05-1332-32/+32
| |\
| | * Merge branch '5.5' into 10.1Vicențiu Ciorbaru2019-05-1134-34/+34
| | |\
| | | * Update FSF AddressVicențiu Ciorbaru2019-05-1126-26/+26
* | | | Merge branch '10.2' into 10.3Oleksandr Byelkin2019-05-122-3/+4
|\ \ \ \ | |/ / /
| * | | Merge branch '10.1' into 10.2Oleksandr Byelkin2019-05-042-5/+7
| |\ \ \ | | |/ /
| | * | MDEV-17640 UMASK_DIR configuration for mysql_install_db is not applied to mys...Sergei Golubchik2019-04-241-3/+5
| | * | use the correct SQL SECURITY type for OpenGIS stored proceduresSergei Golubchik2019-04-241-2/+2
* | | | Merge branch '10.2' into 10.3Sergei Golubchik2019-03-171-3/+6
|\ \ \ \ | |/ / /
| * | | Merge branch '10.1' into 10.2Sergei Golubchik2019-03-151-3/+6
| |\ \ \ | | |/ /
| | * | MDEV-18934: Document missing mysqldumpslow sort optionsIan Gilfillan2019-03-151-3/+6
* | | | Merge 10.2 into 10.3Marko Mäkelä2019-03-113-20/+11
|\ \ \ \ | |/ / /
| * | | Merge 10.1 into 10.2Marko Mäkelä2019-03-114-39/+43
| |\ \ \ | | |/ /
| | * | remove WSREP_SST_OPT_SUFFIX_VALUE, checking [mysqld] is covered in the parse_...Jan Lindström2019-03-091-3/+0
| | * | wsrep_sst: remove WSREP_SST_OPT_SUFFIX_VALUE, checking [mysqld] is covered in...Daniel Black2019-03-093-10/+2
| | * | MDEV-18830: Port SST fixes from 10.4 to 10.1Jan Lindström2019-03-091-34/+59
* | | | Merge branch '10.2' into bb-10.3-mergeOleksandr Byelkin2019-02-191-3/+5
|\ \ \ \ | |/ / /
| * | | Merge branch '10.1' into 10.2Oleksandr Byelkin2019-02-191-3/+5
| |\ \ \ | | |/ /
| | * | 1. centos has symlinks /bin->usr/bin and /sbin -> usr/sbin,Oleksandr Byelkin2019-02-191-3/+5
| | * | MDEV-18426: Most of the mtr tests in the galera_3nodes suite failJulius Goryavsky2019-02-122-4/+4
* | | | dirty mergeOleksandr Byelkin2019-02-073-9/+20
|\ \ \ \ | |/ / /
| * | | Merge 10.1 into 10.2Marko Mäkelä2019-02-031-5/+16
| |\ \ \ | | |/ /
| | * | Merge 10.1 into 10.1Marko Mäkelä2019-02-021-5/+15
| | |\ \
| | | * \ Merge branch '5.5' into 10.0Oleksandr Byelkin2019-01-281-5/+14
| | | |\ \ | | | | |/
| | | | * MDEV-14580: mysql_install_db elements based on dirname of mysql_install_dbSergei Golubchik2019-01-211-4/+7
| | | | * MDEV-14580: mysql_install_db elements based on dirname of mysql_install_dbDaniel Black2019-01-211-0/+11
| | | | * remove duplicated paragraph from mysql_install_db.shAlexander Kuleshov2019-01-161-3/+0
| * | | | MDEV-18379: IPv6 compatibility changes/Unification of check for IPv6Julius Goryavsky2019-02-022-5/+5
| * | | | Merge 10.1 into 10.2Marko Mäkelä2019-02-023-11/+34
| |\ \ \ \ | | |/ / /
| | * | | MDEV-18379: Unification of check for IPv6Julius Goryavsky2019-01-263-10/+34
* | | | | MDEV-18372: Minor MDEV-17973-related merge issue to 10.3Geoff Montee2019-01-241-3/+0
* | | | | 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
* | | | | | 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 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 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.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