summaryrefslogtreecommitdiff
path: root/support-files/mysql.server.sh
Commit message (Expand)AuthorAgeFilesLines
* Merge branch '10.1' into 10.2Oleksandr Byelkin2019-07-261-1/+1
|\
| * Merge branch '5.5' into 10.1Oleksandr Byelkin2019-07-251-1/+1
| |\
| | * use -f with pgrepMostafa Hussein2019-07-081-1/+1
* | | Merge 10.1 into 10.2Marko Mäkelä2019-02-031-1/+5
|\ \ \ | |/ /
| * | Merge 10.1 into 10.1Marko Mäkelä2019-02-021-1/+5
| |\ \
| | * \ Merge branch '5.5' into 10.0Oleksandr Byelkin2019-01-281-1/+5
| | |\ \ | | | |/
| | | * MDEV-18059 `support-files/mysql.server.sh stop` must run as rootSergei Golubchik2019-01-231-1/+5
* | | | Merge 10.1 into 10.2Marko Mäkelä2018-11-061-12/+19
|\ \ \ \ | |/ / /
| * | | Merge branch '10.0' into 10.1Sergei Golubchik2018-10-301-12/+19
| |\ \ \ | | |/ /
| | * | Merge branch '5.5' into 10.0Sergei Golubchik2018-10-271-12/+19
| | |\ \ | | | |/
| | | * Bug#27919254 MYSQL USER ESCALATES ITS PRIVILEGE BY PLACING ARBITRARY PIDS INT...Sergei Golubchik2018-10-241-12/+19
* | | | Merge branch '10.1' into 10.2Sergei Golubchik2018-06-211-1/+0
|\ \ \ \ | |/ / /
| * | | Merge branch '10.0-galera' into 10.1Vicențiu Ciorbaru2018-06-121-1/+0
| |\ \ \
| | * \ \ Merge remote-tracking branch 'origin/5.5-galera' into 10.0-galeraJan Lindström2018-05-071-2/+0
| | |\ \ \
| | | * \ \ Merge tag 'mariadb-5.5.60' into 5.5-galeraJan Lindström2018-04-241-22/+21
| | | |\ \ \ | | | | | |/ | | | | |/|
| | | * | | Merge tag 'mariadb-5.5.55' into bb-5.5-sachin-mergeSachin Setiya2017-04-181-8/+2
| | | |\ \ \
| | | * \ \ \ Merge tag 'mariadb-5.5.54' into 5.5-galeramariadb-galera-5.5.54Nirbhay Choubey2016-12-271-7/+1
| | | |\ \ \ \
| | | * \ \ \ \ Merge remote-tracking branch 'origin/5.5' into 5.5-galeraNirbhay Choubey2016-10-141-1/+1
| | | |\ \ \ \ \
| | | * \ \ \ \ \ Merge tag 'mariadb-5.5.52' into 5.5-galeramariadb-galera-5.5.52Nirbhay Choubey2016-09-191-1/+1
| | | |\ \ \ \ \ \
| | | * \ \ \ \ \ \ Merge tag 'mariadb-5.5.47' into 5.5-galeraNirbhay Choubey2015-12-101-1/+1
| | | |\ \ \ \ \ \ \
| | * | \ \ \ \ \ \ \ Merge tag 'mariadb-10.0.34' into 10.0-galeramariadb-galera-10.0.34Jan Lindström2018-02-011-31/+23
| | |\ \ \ \ \ \ \ \ \ | | | | |_|_|_|_|_|_|/ | | | |/| | | | | | |
| | * | | | | | | | | Merge tag 'mariadb-10.0.31' into 10.0-galeraSachin Setiya2017-05-301-8/+2
| | |\ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ Merge tag 'mariadb-10.0.29' into 10.0-galeraNirbhay Choubey2017-01-131-7/+1
| | |\ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ Merge tag 'mariadb-10.0.28' into 10.0-galeraNirbhay Choubey2016-10-281-1/+1
| | |\ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ Merge tag 'mariadb-10.0.23' into 10.0-galeraNirbhay Choubey2015-12-191-1/+1
| | |\ \ \ \ \ \ \ \ \ \ \ \
* | | \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'github/10.1' into 10.2Sergei Golubchik2018-02-061-23/+23
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / /
| * | | | | | | | | | | | | | Merge branch 'github/10.0' into 10.1Sergei Golubchik2018-02-021-23/+23
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|/ / / / / / / / | | |/| | | | | | | | | | | |
| | * | | | | | | | | | | | | Merge remote-tracking branch '5.5' into 10.0Vicențiu Ciorbaru2018-01-241-24/+24
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|/ / / / / / / / | | |/| | | | | | | | | | | / | | | | |_|_|_|_|_|_|_|_|_|/ | | | |/| | | | | | | | | |
| | | * | | | | | | | | | | MDEV-5510: Replace MySQL -> MariaDB in init scriptsDaniel Black2018-01-231-24/+24
| | | | |_|_|_|_|_|_|_|_|/ | | | |/| | | | | | | | |
* | | | | | | | | | | | | Merge branch '10.1' into 10.2Sergei Golubchik2017-05-091-8/+2
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / /
| * | | | | | | | | | | | Merge branch '10.0' 10.1Sergei Golubchik2017-04-281-8/+2
| |\ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / /
| | * | | | | | | | | | | Merge branch '5.5' into 10.0Sergei Golubchik2017-04-211-8/+2
| | |\ \ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / / | | | | | | | / / / / / / | | | |_|_|_|/ / / / / / | | |/| | | | | | | | |
| | | * | | | | | | | | Merge remote-tracking branch 'mysql/5.5' into 5.5mariadb-5.5.55Sergei Golubchik2017-04-111-8/+2
| | | |\ \ \ \ \ \ \ \ \ | | | | |_|_|_|_|_|_|_|/ | | | |/| | | | | | | |
| | | | * | | | | | | | Bug#25144379 MYSQLD PROCESS DOES NOT INCLUDE FULL PATH WHEN STARTING MYSQL SE...Terje Rosten2017-02-131-13/+1
| | | | * | | | | | | | BUG#13788154 INIT.D MYSQL SCRIPT CREATED BY MYSQL SOLARIS PACKAGE FAILS TO RU...Terje Rosten2016-12-061-1/+1
| | | | * | | | | | | | Bug#24464380 PRIVILEGE ESCALATION USING MYSQLD_SAFETerje Rosten2016-08-181-1/+1
| * | | | | | | | | | | spelling fixesklemens2017-03-071-1/+1
* | | | | | | | | | | | Merge branch '10.1' into 10.2Sergei Golubchik2017-02-101-7/+1
|\ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / /
| * | | | | | | | | | | Merge branch '10.0' into 10.1Vicențiu Ciorbaru2017-01-161-7/+1
| |\ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / /
| | * | | | | | | | | | Merge remote-tracking branch 'origin/5.5' into 10.0vicentiu2017-01-061-7/+1
| | |\ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / | | | | | | | / / / / / | | | |_|_|_|/ / / / / | | |/| | | | | | | |
| | | * | | | | | | | Numerous issues in mysqld_safeSergei Golubchik2016-12-221-7/+1
| | | | |_|_|_|_|_|/ | | | |/| | | | | |
* | | | | | | | | | Merge branch '10.1' into 10.2Sergei Golubchik2016-12-291-1/+1
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / /
| * | | | | | | | | Merge branch '10.0' into 10.1Sergei Golubchik2016-09-291-1/+1
| |\ \ \ \ \ \ \ \ \ | | |/ / / / / / / /
| | * | | | | | | | Merge branch '5.5' into 10.0Sergei Golubchik2016-09-291-1/+1
| | |\ \ \ \ \ \ \ \ | | | |/ / / / / / /
| | | * | | | | | | mysqld_safe: close stdout and stderrSergei Golubchik2016-09-291-1/+1
| | | | |_|_|_|_|/ | | | |/| | | | |
| * | | | | | | | Merge branch '10.0' into 10.1Sergei Golubchik2016-09-281-1/+1
| |\ \ \ \ \ \ \ \ | | |/ / / / / / /
| | * | | | | | | Merge branch '5.5' into 10.0Sergei Golubchik2016-09-271-1/+1
| | |\ \ \ \ \ \ \ | | | |/ / / / / / | | | | | | / / / | | | |_|_|/ / / | | |/| | | | |
| | | * | | | | Merge branch 'mysql/5.5' into 5.5Sergei Golubchik2016-09-111-1/+1
| | | |\ \ \ \ \ | | | | |_|_|_|/ | | | |/| | | |
| | | | * | | | Bug#24464380 PRIVILEGE ESCALATION USING MYSQLD_SAFETerje Rosten2016-08-251-1/+1
| | | | |/ / /
| | | | * | | local merge.Nirbhay Choubey2013-04-091-1/+7
| | | | |\ \ \