summaryrefslogtreecommitdiff
path: root/scripts
Commit message (Expand)AuthorAgeFilesLines
* 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
| | | |\ \ \ \
| | | | * | | | Fix typo in `--srcdir` option in echo message status of mysql_install_dbAnel Husakovic2018-08-251-1/+1
| | | | | |_|/ | | | | |/| |
| | | * | | | Merge pull request #855 from tempesta-tech/sysprg/10.1-MDEV-10756Jan Lindström2018-09-063-2/+38
| | | |\ \ \ \
| | | | * | | | MDEV-10756: wsrep_sst_xtrabackup-v2 does not support innodb_data_home_dirJulius Goryavsky2018-08-273-2/+38
| | | * | | | | MDEV-15436: If log_bin and log_bin_index is different SST with rsync fails.Jan Lindström2018-09-052-8/+39
| | | * | | | | galera_new_cluster.sh: unused variablesDaniel Black2018-09-031-3/+0
* | | | | | | | Merge 10.3 into 10.4Marko Mäkelä2018-09-141-0/+4
|\ \ \ \ \ \ \ \ | |/ / / / / / /
| * | | | | | | 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.3 into 10.4Marko Mäkelä2018-09-113-15/+99
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / /
| * | | | | | | | 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
| | | | | |_|/ / / / | | | | |/| | | | |
* | | | | | | | | | MDEV-15851 Stop creating mysql.host tableVladislav Vaintroub2018-08-162-48/+1
* | | | | | | | | | Merge 10.3 into 10.4Marko Mäkelä2018-08-168-43/+106
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / /
| * | | | | | | | | 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