summaryrefslogtreecommitdiff
path: root/scripts
Commit message (Expand)AuthorAgeFilesLines
* Merge pull request #850 from HeMan/10.3Jan Lindström2018-09-111-0/+4
|\
| * Return code from starting MariaDB.Jimmy Hedman2018-08-241-0/+4
* | Merge 10.2 into 10.3Marko Mäkelä2018-09-063-5/+35
|\ \
| * \ Merge 10.1 into 10.2Marko Mäkelä2018-08-313-5/+35
| |\ \
| | * | MDEV-15512 - Fix sh parse error when [sst] config value has spaces.Jan Lindström2018-08-291-2/+2
| | * | Merge pull request #539 from grooverdan/10.1-wsrep_sst_rsync_read_MYSQL_BASE_...Jan Lindström2018-08-281-2/+1
| | |\ \
| | | * \ Merge branch '10.1' into 10.1-wsrep_sst_rsync_read_MYSQL_BASE_VERSION_configDaniel Black2018-02-047-143/+99
| | | |\ \
| | | * | | galera_recovery: misses reading default configuration groupsDaniel Black2018-01-131-2/+1
| | | * | | wsrep_sst_rsync: read correct configuration sectionsDaniel Black2018-01-131-13/+1
| | * | | | Fixes of the base patch for compatibility with the 10.1 branchJulius Goryavsky2018-08-171-1/+1
| | * | | | Reverting changes made to support the mtr under the rootJulius Goryavsky2018-08-131-2/+0
| | * | | | Fixes after review and correction of the problems caused by the fact that dur...Julius Goryavsky2018-08-092-4/+31
| | * | | | Merge branch '10.1' of https://github.com/MariaDB/server into sysprg/10.1-MDE...Julius Goryavsky2018-08-086-30/+95
| | |\ \ \ \
| | * | | | | MDEV-10754 wsrep_sst_rsync does not support innodb_data_home_dirJulius Goryavsky2018-07-261-1/+8
* | | | | | | Merge 10.2 into 10.3Marko Mäkelä2018-08-281-10/+64
|\ \ \ \ \ \ \ | |/ / / / / / | | | | | | / | |_|_|_|_|/ |/| | | | |
| * | | | | Use stunnel during rsync SST if availablebenrubson2018-08-241-10/+64
| * | | | | After-merge fix: Revert MDEV-15511Marko Mäkelä2018-08-211-66/+14
| * | | | | Merge 10.1 into 10.2Marko Mäkelä2018-08-211-14/+66
| |\ \ \ \ \ | | | |/ / / | | |/| | |
| | * | | | Merge pull request #609 from benrubson/stunnelJan Lindström2018-08-051-7/+60
| | |\ \ \ \
| | | * | | | Use stunnel during rsync SST if availablebenrubson2018-02-121-7/+60
| | | | |_|/ | | | |/| |
* | | | | | Merge branch '10.2' into 10.3Sergei Golubchik2018-08-121-6/+13
|\ \ \ \ \ \ | |/ / / / /
| * | | | | MDEV-16906 No groups to be reported (check your GNRs) - mysqld_multi does not...Sergei Golubchik2018-08-071-6/+13
* | | | | | Merge 10.2 into 10.3Marko Mäkelä2018-08-038-37/+93
|\ \ \ \ \ \ | |/ / / / /
| * | | | | MDEV-14637: Fix hang due to persistent statisticsMarko Mäkelä2018-08-032-6/+6
| * | | | | Merge 10.1 into 10.2Marko Mäkelä2018-08-028-32/+88
| |\ \ \ \ \ | | |/ / / /
| | * | | | Merge branch '10.0' into bb-10.1-merge-sanjaOleksandr Byelkin2018-07-255-23/+35
| | |\ \ \ \ | | | |_|/ / | | |/| | |
| | | * | | Merge branch '5.5' into bb-10.0-merge-sanjaOleksandr Byelkin2018-07-233-3/+3
| | | |\ \ \
| | | | * | | MDEV-15050 scripts: mysql_install_db.{sh|pl}, mysqld_multi - mysqld is in @sb...Daniel Black2018-07-163-3/+3
| | | * | | | MDEV-14882 mysql_upgrade performs unnecessary conversions back and forthSergei Golubchik2018-07-191-20/+30
| | | * | | | MDEV-11790 WITHOUT_SERVER installs mysqld_safe_helperSergei Golubchik2018-07-191-0/+2
| | * | | | | Merge branch '10.0' into bb-10.1-mergebb-10.1-merge-sanjaOleksandr Byelkin2018-07-191-0/+5
| | |\ \ \ \ \ | | | |/ / / /
| | | * | | | Merge branch '5.5' into bb-10.0-mergeOleksandr Byelkin2018-07-171-0/+5
| | | |\ \ \ \ | | | | |/ / /
| | | | * | | Added more help text in case mysql_install_db fails.Michael Widenius2018-06-271-0/+5
| | * | | | | Merge pull request #786 from codership/10.1-MDEV-14612Jan Lindström2018-07-181-7/+2
| | |\ \ \ \ \
| | | * | | | | MDEV-14612 wsrep_sst_mariabackup unnecessarily converts address to host namesjaakola2018-06-071-7/+2
| | * | | | | | MDEV-15442 xtrabackup-v2 SST donor stuck in DONOR/DESYNCED state when joiner ...mkaruza2018-06-202-1/+24
| | * | | | | | MDEV-15442 xtrabackup-v2 SST donor stuck in DONOR/DESYNCED state when joiner ...mkaruza2018-06-191-1/+22
* | | | | | | | Don't give warnings from perror or resolveip with safemallocMichael Widenius2018-07-291-1/+1
* | | | | | | | Merge branch '10.2' into 10.3Sergei Golubchik2018-06-305-30/+70
|\ \ \ \ \ \ \ \ | |/ / / / / / /
| * | | | | | | Merge branch '10.1' into 10.2Sergei Golubchik2018-06-213-16/+42
| |\ \ \ \ \ \ \ | | |/ / / / / /
| | * | | | | | more sst test failuresSergei Golubchik2018-06-151-7/+6
| | * | | | | | fix galera sst testsSergei Golubchik2018-06-141-3/+2
| | * | | | | | Merge branch '10.0-galera' into 10.1Vicențiu Ciorbaru2018-06-123-16/+38
| | |\ \ \ \ \ \ | | | |/ / / / / | | |/| | | | |
| | | * | | | | MDEV-15351: wsrep_sst_xtrabackup is broken in 10.1.31Jan Lindström2018-05-141-1/+0
| | | * | | | | MDEV-13968: wsrep_log_error not defined until later in wsrep_sst_commonDaniel Black2018-05-141-1/+1
| | | * | | | | MDEV-13968 sst fails with "WSREP_SST_OPT_PORT: readonly variable"Sergei Golubchik2018-05-141-2/+2
| | | * | | | | MDEV-13968 sst fails with "WSREP_SST_OPT_PORT: readonly variable"Sergei Golubchik2018-05-141-0/+11
| | | * | | | | MDEV-15541: wsrep_sst_common - WSREP_SST_OPT_PORT set twice (--address and --...Daniel Black2018-05-141-1/+1
| | | * | | | | MDEV-15496: wsrep_sst_common - parse IPv6 correctDaniel Black2018-05-141-11/+18
| | | * | | | | Merge remote-tracking branch 'origin/5.5-galera' into 10.0-galeraJan Lindström2018-05-072-1/+17
| | | |\ \ \ \ \