summaryrefslogtreecommitdiff
path: root/scripts
Commit message (Expand)AuthorAgeFilesLines
* Merge remote-tracking branch 'origin/10.1' into 10.2Alexander Barkov2015-12-295-50/+57
|\
| * MDEV-9209 - [PATCH] scripts: Do not prepend the prefix to absolute pathsSergey Vojtovich2015-12-221-21/+20
| * Merge branch '10.1' into bb-10.1-sergSergei Golubchik2015-12-221-12/+22
| |\
| | * MDEV-9141 : [PATCH] Add CA validation to wsrep_sst_xtrabackup-v2.shNirbhay Choubey2015-12-201-12/+22
| * | Merge branch 'github/10.0-galera' into 10.1Sergei Golubchik2015-12-221-11/+0
| |\ \
| | * \ Merge tag 'mariadb-10.0.23' into 10.0-galeraNirbhay Choubey2015-12-193-12/+19
| | |\ \
| | * | | Remove duplicate code.Nirbhay Choubey2015-11-201-11/+0
| * | | | Merge branch '10.0' into 10.1Sergei Golubchik2015-12-211-6/+14
| |\ \ \ \ | | | |/ / | | |/| / | | |_|/ | |/| |
| | * | Merge branch '5.5' into 10.0Sergei Golubchik2015-12-131-6/+14
| | |\ \
| | | * | MDEV-7341 mysqld_multi doesn't recognize include directive (not following inc...Sergei Golubchik2015-12-071-6/+14
| * | | | Fix syntax error in wsrep_sst_common.sh.mariadb-10.1.9Nirbhay Choubey2015-11-201-0/+1
* | | | | MDEV-9297 - mysql_install_db launches mysqld 3xSergey Vojtovich2015-12-291-21/+1
* | | | | MDEV-7376 - Removal of the tool "mysql_zap"Sergey Vojtovich2015-11-262-173/+0
* | | | | MDEV-8654 - Remove mysqlbugSergey Vojtovich2015-11-262-442/+0
|/ / / /
* | | | Merge branch 'github/10.0-galera' into 10.1Sergei Golubchik2015-11-195-152/+269
|\ \ \ \ | | |_|/ | |/| |
| * | | MTR: rsync process is left running if pid file is removedNirbhay Choubey2015-11-161-6/+11
| * | | Merge tag 'mariadb-10.0.22' into 10.0-galeraNirbhay Choubey2015-10-313-20/+18
| |\ \ \
| * | | | Slight cleanup improvement on a previous commit.Alexey Yurchenko2015-09-091-2/+2
| * | | | Refs codership/mysql-wsrep#143 . Account for the case where the SST password ...Philip Stoev2015-09-091-1/+1
| * | | | Refs codership/mysql-wsrep#141: this commitAlexey Yurchenko2015-09-092-2/+13
| * | | | Merge branch '5.5-galera' into 10.0-galeraNirbhay Choubey2015-09-095-146/+247
| |\ \ \ \
| | * | | | Fixes codership/mysql-wsrep#153 use --defaults-extra-file with mysqldump SSTPhilip Stoev2015-09-091-2/+4
| | * | | | Slight cleanup improvement on a previous commit.Alexey Yurchenko2015-09-091-2/+2
| | * | | | Refs codership/mysql-wsrep#143 . Account for the case where the SST password ...Philip Stoev2015-09-091-1/+1
| | * | | | Synced xtrabackup SST fixes from Percona tree (as of PXC 5.6.24-25.11 release...Alexey Yurchenko2015-09-093-108/+214
| | * | | | Refs codership/mysql-wsrep#141: this commitAlexey Yurchenko2015-09-095-40/+59
| * | | | | Merge tag 'mariadb-10.0.21' into 10.0-galeraNirbhay Choubey2015-08-083-512/+539
| |\ \ \ \ \
| * | | | | | MDEV-7903 : xtrabackup SST failing with maria-10.0-galeramariadb-galera-10.0.20Nirbhay Choubey2015-06-241-1/+2
| * | | | | | Merge tag 'mariadb-10.0.20' into 10.0-galeraNirbhay Choubey2015-06-211-16/+10
| |\ \ \ \ \ \
| * | | | | | | Remove duplicate script added due to bad merge.Nirbhay Choubey2015-06-211-26/+0
| * | | | | | | Merge branch '5.5-galera' into 10.0-galeramariadb-galera-10.0.19Nirbhay Choubey2015-05-141-1/+1
| |\ \ \ \ \ \ \ | | | |_|/ / / / | | |/| | | | |
| | * | | | | | mysql-wsrep#38 : wsrep_sst_xtrabackup-v2 script causes innobackupex toNirbhay Choubey2015-05-141-1/+1
| * | | | | | | Merge branch '5.5-galera' into 10.0-galeraNirbhay Choubey2015-05-121-0/+26
| |\ \ \ \ \ \ \ | | |/ / / / / /
| | * | | | | | Merge tag 'mariadb-5.5.43' into 5.5-galeraNirbhay Choubey2015-05-041-1/+1
| | |\ \ \ \ \ \ | | | | |_|_|_|/ | | | |/| | | |
| | * | | | | | This commitAlexey Yurchenko2015-05-041-2/+3
| | * | | | | | Going more MTR-friendly - for SST prefer to use mysql client, mysqldump and m...Alexey Yurchenko2015-05-045-17/+42
| | * | | | | | Refs #8: [5.5] preserve gvwstate.dat for pc recovery featuredirtysalt2015-05-041-1/+1
| | * | | | | | Merge branch '5.5' into 5.5-galeraNirbhay Choubey2015-02-183-6/+17
| | |\ \ \ \ \ \
| | * | | | | | | MDEV-6771 : Incorrect Size for Transfer Reported to pvNirbhay Choubey2015-01-132-2/+2
| | * | | | | | | Merge revisions from maria/5.5 (5.5.41)Nirbhay Choubey2014-12-222-10/+3
| | |\ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ Merge revisions from maria/5.5Nirbhay Choubey2014-12-161-2/+2
| | |\ \ \ \ \ \ \ \
| | * | | | | | | | | MDEV-6891: Update company nameNirbhay Choubey2014-12-121-2/+2
| | * | | | | | | | | bzr merge -rtag:mariadb-5.5.40 maria/5.5Nirbhay Choubey2014-10-092-0/+20
| | |\ \ \ \ \ \ \ \ \
| | * | | | | | | | | | Updated config files:Nirbhay Choubey2014-09-231-0/+0
| | * | | | | | | | | | Local merge of mariadb-5.5.39Nirbhay Choubey2014-08-064-19/+18
| | |\ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | MDEV-4728: MariaDB can't start while bootupNirbhay Choubey2014-07-151-2/+13
| | * | | | | | | | | | | MDEV-6225: Idle replication slave keeps crashing.Jan Lindström2014-06-301-2/+2
| | * | | | | | | | | | | bzr merge -r3985..3997 codership/5.5Nirbhay Choubey2014-06-104-19/+85
| | * | | | | | | | | | | bzr merge -r3980..3984 codership/5.5 Nirbhay Choubey2014-06-102-9/+14
| | * | | | | | | | | | | bzr merge -rtag:mariadb-5.5.38 maria/5.5Nirbhay Choubey2014-06-102-2/+2
| | |\ \ \ \ \ \ \ \ \ \ \