summaryrefslogtreecommitdiff
path: root/scripts
Commit message (Expand)AuthorAgeFilesLines
* 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
* | | | | 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
| | |\ \ \
| | | * | | MariaDB adjustments.Jan Lindström2018-04-241-1/+1
| | | * | | Merge tag 'mariadb-5.5.60' into 5.5-galeraJan Lindström2018-04-241-3/+3
| | | |\ \ \ | | | | | |/ | | | | |/|
| | | * | | Bump wsrep patch version to 25.23Teemu Ollakka2018-02-251-1/+1
| | | * | | Merge tag 'mariadb-5.5.59' into 5.5-galeraJan Lindström2018-01-192-6/+12
| | | |\ \ \
| | | * | | | MDEV-13478 Full SST sync fails because of the error in the cleaning partSachin Setiya2017-12-201-1/+1
| | | * | | | MW-384 protect access to wsrep_ready variable with mutexAlexey Yurchenko2017-10-191-3/+3
| | | * | | | Merge tag 'mariadb-5.5.58' into 5.5-galeraJan Lindström2017-10-192-23/+30
| | | |\ \ \ \
| | | * \ \ \ \ Merge tag 'mariadb-5.5.57' into 5.5-galeraJan Lindström2017-07-2014-63/+46
| | | |\ \ \ \ \
| | | * | | | | | MDEV-11036 Add link wsrep_sst_rsync_wan -> wsrep_sst_rsyncbb-sachin-11036Sachin Setiya2017-06-201-0/+16
| | | * | | | | | Merge tag 'mariadb-5.5.55' into bb-5.5-sachin-mergeSachin Setiya2017-04-182-22/+55
| | | |\ \ \ \ \ \
| | | * | | | | | | Fix bad mergeNirbhay Choubey2017-01-151-1/+0
| | | * | | | | | | Merge tag 'mariadb-5.5.54' into 5.5-galeramariadb-galera-5.5.54Nirbhay Choubey2016-12-272-60/+47
| | | |\ \ \ \ \ \ \
| | | * \ \ \ \ \ \ \ Merge remote-tracking branch 'origin/5.5' into 5.5-galeraNirbhay Choubey2016-10-141-1/+5
| | | |\ \ \ \ \ \ \ \
| | | * | | | | | | | | MDEV-10853 netcat help output in error log when running xtrabackup SSTHartmut Holzgraefe2016-09-222-2/+2
| | * | | | | | | | | | Merge pull request #557 from grooverdan/10.0-galera-wsrep_sst_mysqldump-safetyJan Lindström2018-04-061-1/+1
| | |\ \ \ \ \ \ \ \ \ \
| | | * | | | | | | | | | wsrep_sst_mysqldump: safer test of version != 5Daniel Black2018-01-161-1/+1
* | | | | | | | | | | | | mysql_install_db: clarify the after-install messageSergei Golubchik2018-06-211-13/+18
* | | | | | | | | | | | | MDEV-14578: mysql_install_db install unix_socket plugin when --auth-root-auth...Sergei Golubchik2018-06-213-7/+7
* | | | | | | | | | | | | MDEV-14578: mysql_install_db install unix_socket plugin when --auth-root-auth...Daniel Black2018-06-212-1/+10
* | | | | | | | | | | | | Merge branch '10.1' into 10.2Sergei Golubchik2018-05-101-1/+0
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / /
| * | | | | | | | | | | | MDEV-15351: wsrep_sst_xtrabackup is broken in 10.1.31Jan Lindström2018-05-091-1/+0
* | | | | | | | | | | | | Merge branch '10.1' into 10.2Sergei Golubchik2018-03-254-9/+50
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / /
| * | | | | | | | | | | | followup for 89b0d5cb6e3, backport 8c422bf48d7Sergei Golubchik2018-03-231-2/+2
| * | | | | | | | | | | | MDEV-15409 make sure every sst script is tested in buildbotSergei Golubchik2018-03-231-2/+2
| * | | | | | | | | | | | wsrep_sst scripts: support traditional netcatSergei Golubchik2018-03-233-7/+48