summaryrefslogtreecommitdiff
path: root/scripts
Commit message (Expand)AuthorAgeFilesLines
* MDEV-11170: MariaDB 10.2 cannot start on MySQL 5.7 datadir:Vicențiu Ciorbaru2017-02-141-0/+6
* Merge branch '10.1' into 10.2Sergei Golubchik2017-02-104-72/+94
|\
| * Minor typoiangilfillan2017-01-261-1/+1
| * mysql_install_db enhancements to facilitate Debian bug#848616 fixKristian Nielsen2017-01-172-10/+57
| * Post merge review fixesVicențiu Ciorbaru2017-01-171-4/+0
| * Merge remote-tracking branch '10.0-galera' into 10.1Vicențiu Ciorbaru2017-01-161-8/+7
| |\
| | * Merge tag 'mariadb-10.0.29' into 10.0-galeraNirbhay Choubey2017-01-132-66/+51
| | |\
| | * \ Merge tag 'mariadb-10.0.28' into 10.0-galeraNirbhay Choubey2016-10-281-1/+5
| | |\ \
| * | \ \ Merge branch '10.0' into 10.1Vicențiu Ciorbaru2017-01-161-59/+50
| |\ \ \ \ | | | |_|/ | | |/| |
| | * | | Merge branch '5.5' into 10.0Vicențiu Ciorbaru2017-01-121-2/+7
| | |\ \ \
| | | * | | mysqld_safe: don't close stdout if set -xSergei Golubchik2017-01-101-2/+7
| | * | | | Fix problems from 5.5 mergeVicențiu Ciorbaru2017-01-101-2/+1
| | * | | | Merge remote-tracking branch 'origin/5.5' into 10.0vicentiu2017-01-061-63/+45
| | |\ \ \ \ | | | |/ / /
| | | * | | Numerous issues in mysqld_safeSergei Golubchik2016-12-221-63/+44
* | | | | | Merge branch '10.1' into 10.2Sergei Golubchik2016-12-295-41/+46
|\ \ \ \ \ \ | |/ / / / /
| * | | | | Merge branch '10.0' into 10.1Sergei Golubchik2016-12-111-4/+2
| |\ \ \ \ \ | | |/ / / /
| | * | | | Merge branch '5.5' into 10.0Sergei Golubchik2016-12-091-4/+2
| | |\ \ \ \ | | | |/ / / | | | | | / | | | |_|/ | | |/| |
| | | * | MDEV-11242 MariaDB Server releases contains promotion of MariaDB CorporationSergei Golubchik2016-12-031-4/+2
| * | | | MDEV-11052 mariadb-service-convert does not work after upgrading to 10.1.18Sergei Golubchik2016-12-061-4/+5
| * | | | Merge branch '10.0' into 10.1Sergei Golubchik2016-09-291-1/+5
| |\ \ \ \ | | |/ / /
| | * | | Merge branch '5.5' into 10.0Sergei Golubchik2016-09-291-1/+5
| | |\ \ \ | | | |/ /
| | | * | mysqld_safe: close stdout and stderrSergei Golubchik2016-09-291-1/+5
| * | | | Merge branch '10.0-galera' into 10.1Nirbhay Choubey2016-09-282-2/+2
| |\ \ \ \ | | | |_|/ | | |/| |
| | * | | MDEV-10853 netcat help output in error log when running xtrabackup SSTHartmut Holzgraefe2016-09-282-2/+2
| * | | | MDEV-10832 Out of tree build: mysql_install_db to see all .sql files.Alexey Botchkov2016-09-261-1/+1
| * | | | MDEV-10832 - Out of tree build: mysql_install_db to see all .sql files (#237)Daniel Black2016-09-232-31/+34
| * | | | MDEV-10830 - Fix undefined database test error when running mysql_install_db ...hf-10.1-wsrep-debugSeamus Lee2016-09-222-2/+2
* | | | | MDEV-10432: Post-fix after merging PR#205Nirbhay Choubey2016-11-211-21/+28
* | | | | Implement native/base process checks for FreeBSDBernard Spil2016-11-211-12/+22
* | | | | POSIX-ify wsrep scriptsBernard Spil2016-11-212-10/+9
* | | | | MDEV-9903 - 10.2 : Check and run rsync daemon only in the needed IPFrancisco Biete2016-11-071-7/+43
* | | | | Merge branch '10.2' into bb-10.2-connector-c-integ-submSergei Golubchik2016-09-218-13/+24
|\ \ \ \ \
| * \ \ \ \ Merge branch '10.1' into 10.2Sergei Golubchik2016-09-098-13/+24
| |\ \ \ \ \ | | |/ / / /
| | * | | | Merge branch '10.0-galera' into bb-10.1-sergNirbhay Choubey2016-08-254-6/+11
| | |\ \ \ \ | | | |/ / /
| | | * | | Merge branch '5.5-galera' into 10.0-galeraNirbhay Choubey2016-08-241-1/+2
| | | |\ \ \
| | | | * \ \ Merge tag 'mariadb-5.5.51' into 5.5-galeraNirbhay Choubey2016-08-102-2/+2
| | | | |\ \ \ | | | | | | |/ | | | | | |/|
| | | | * | | MDEV-10487: Galera SST using rsync does not filter out lost+foundNirbhay Choubey2016-08-031-1/+2
| | | | * | | Merge tag 'mariadb-5.5.50' into 5.5-galeramariadb-galera-5.5.50Nirbhay Choubey2016-06-231-2/+6
| | | | |\ \ \
| | | * | \ \ \ Merge branch '10.0' into 10.0-galeraNirbhay Choubey2016-08-242-2/+2
| | | |\ \ \ \ \ | | | | | |_|_|/ | | | | |/| | |
| | | * | | | | refs codership/mysql-wsrep#239sjaakola2016-08-213-6/+10
| | | * | | | | Merge tag 'mariadb-10.0.26' into 10.0-galeraNirbhay Choubey2016-06-243-4/+8
| | | |\ \ \ \ \
| | * | \ \ \ \ \ Merge branch '10.0' into 10.1Sergei Golubchik2016-08-252-2/+2
| | |\ \ \ \ \ \ \ | | | | |_|/ / / / | | | |/| | | | |
| | | * | | | | | Merge branch '5.5' into 10.0Sergei Golubchik2016-08-102-2/+2
| | | |\ \ \ \ \ \ | | | | |_|/ / / / | | | |/| | | | / | | | | | |_|_|/ | | | | |/| | |
| | | | * | | | MDEV-10248 Cannot Remove Test TablesElena Stepanova2016-07-152-2/+2
| | | | | |_|/ | | | | |/| |
| | * | | | | MDEV-10396: MariaDB does not restart after upgrade on debian 8Nirbhay Choubey2016-07-271-1/+2
| | * | | | | MDEV-9588 Mariadb client-only build creates a useless mysqld_safe fileSergei Golubchik2016-07-131-5/+10
* | | | | | | mysqld_safe: don't use "$DATADIR/my.cnf"Sergei Golubchik2016-09-191-17/+3
|/ / / / / /
* | | | | | Merge branch '10.1' into 10.2Sergei Golubchik2016-06-3010-13/+178
|\ \ \ \ \ \ | |/ / / / /
| * | | | | Merge branch '10.0' into 10.1Sergei Golubchik2016-06-283-4/+8
| |\ \ \ \ \ | | |/ / / /
| | * | | | Merge branch 'bb-10.0-serg' into 10.0Sergei Golubchik2016-06-211-2/+6
| | |\ \ \ \