Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge 10.1 into 10.1 | Marko Mäkelä | 2019-02-02 | 1 | -1/+5 |
|\ | |||||
| * | Merge branch '5.5' into 10.0 | Oleksandr Byelkin | 2019-01-28 | 1 | -1/+5 |
| |\ | |||||
| | * | MDEV-18059 `support-files/mysql.server.sh stop` must run as root | Sergei Golubchik | 2019-01-23 | 1 | -1/+5 |
* | | | Merge branch '10.0' into 10.1 | Sergei Golubchik | 2018-10-30 | 1 | -12/+19 |
|\ \ \ | |/ / | |||||
| * | | Merge branch '5.5' into 10.0 | Sergei Golubchik | 2018-10-27 | 1 | -12/+19 |
| |\ \ | | |/ | |||||
| | * | Bug#27919254 MYSQL USER ESCALATES ITS PRIVILEGE BY PLACING ARBITRARY PIDS INT... | Sergei Golubchik | 2018-10-24 | 1 | -12/+19 |
* | | | Merge branch '10.0-galera' into 10.1 | Vicențiu Ciorbaru | 2018-06-12 | 1 | -1/+0 |
|\ \ \ | |||||
| * \ \ | Merge remote-tracking branch 'origin/5.5-galera' into 10.0-galera | Jan Lindström | 2018-05-07 | 1 | -2/+0 |
| |\ \ \ | |||||
| | * \ \ | Merge tag 'mariadb-5.5.60' into 5.5-galera | Jan Lindström | 2018-04-24 | 1 | -22/+21 |
| | |\ \ \ | | | | |/ | | | |/| | |||||
| | * | | | Merge tag 'mariadb-5.5.55' into bb-5.5-sachin-merge | Sachin Setiya | 2017-04-18 | 1 | -8/+2 |
| | |\ \ \ | |||||
| | * \ \ \ | Merge tag 'mariadb-5.5.54' into 5.5-galeramariadb-galera-5.5.54 | Nirbhay Choubey | 2016-12-27 | 1 | -7/+1 |
| | |\ \ \ \ | |||||
| | * \ \ \ \ | Merge remote-tracking branch 'origin/5.5' into 5.5-galera | Nirbhay Choubey | 2016-10-14 | 1 | -1/+1 |
| | |\ \ \ \ \ | |||||
| | * \ \ \ \ \ | Merge tag 'mariadb-5.5.52' into 5.5-galeramariadb-galera-5.5.52 | Nirbhay Choubey | 2016-09-19 | 1 | -1/+1 |
| | |\ \ \ \ \ \ | |||||
| | * \ \ \ \ \ \ | Merge tag 'mariadb-5.5.47' into 5.5-galera | Nirbhay Choubey | 2015-12-10 | 1 | -1/+1 |
| | |\ \ \ \ \ \ \ | |||||
| * | \ \ \ \ \ \ \ | Merge tag 'mariadb-10.0.34' into 10.0-galeramariadb-galera-10.0.34 | Jan Lindström | 2018-02-01 | 1 | -31/+23 |
| |\ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|/ | | |/| | | | | | | | |||||
| * | | | | | | | | | Merge tag 'mariadb-10.0.31' into 10.0-galera | Sachin Setiya | 2017-05-30 | 1 | -8/+2 |
| |\ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ | Merge tag 'mariadb-10.0.29' into 10.0-galera | Nirbhay Choubey | 2017-01-13 | 1 | -7/+1 |
| |\ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ | Merge tag 'mariadb-10.0.28' into 10.0-galera | Nirbhay Choubey | 2016-10-28 | 1 | -1/+1 |
| |\ \ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ \ | Merge tag 'mariadb-10.0.23' into 10.0-galera | Nirbhay Choubey | 2015-12-19 | 1 | -1/+1 |
| |\ \ \ \ \ \ \ \ \ \ \ \ | |||||
* | \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'github/10.0' into 10.1 | Sergei Golubchik | 2018-02-02 | 1 | -23/+23 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|/ / / / / / / / | |/| | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | | Merge remote-tracking branch '5.5' into 10.0 | Vicențiu Ciorbaru | 2018-01-24 | 1 | -24/+24 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|/ / / / / / / / | |/| | | | | | | | | | | / | | | |_|_|_|_|_|_|_|_|_|/ | | |/| | | | | | | | | | | |||||
| | * | | | | | | | | | | | MDEV-5510: Replace MySQL -> MariaDB in init scripts | Daniel Black | 2018-01-23 | 1 | -24/+24 |
| | | |_|_|_|_|_|_|_|_|/ | | |/| | | | | | | | | | |||||
* | | | | | | | | | | | | Merge branch '10.0' 10.1 | Sergei Golubchik | 2017-04-28 | 1 | -8/+2 |
|\ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / | |||||
| * | | | | | | | | | | | Merge branch '5.5' into 10.0 | Sergei Golubchik | 2017-04-21 | 1 | -8/+2 |
| |\ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / | | | | | | / / / / / / | | |_|_|_|/ / / / / / | |/| | | | | | | | | | |||||
| | * | | | | | | | | | Merge remote-tracking branch 'mysql/5.5' into 5.5mariadb-5.5.55 | Sergei Golubchik | 2017-04-11 | 1 | -8/+2 |
| | |\ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|_|/ | | |/| | | | | | | | | |||||
| | | * | | | | | | | | Bug#25144379 MYSQLD PROCESS DOES NOT INCLUDE FULL PATH WHEN STARTING MYSQL SE... | Terje Rosten | 2017-02-13 | 1 | -13/+1 |
| | | * | | | | | | | | BUG#13788154 INIT.D MYSQL SCRIPT CREATED BY MYSQL SOLARIS PACKAGE FAILS TO RU... | Terje Rosten | 2016-12-06 | 1 | -1/+1 |
| | | * | | | | | | | | Bug#24464380 PRIVILEGE ESCALATION USING MYSQLD_SAFE | Terje Rosten | 2016-08-18 | 1 | -1/+1 |
* | | | | | | | | | | | spelling fixes | klemens | 2017-03-07 | 1 | -1/+1 |
* | | | | | | | | | | | Merge branch '10.0' into 10.1 | Vicențiu Ciorbaru | 2017-01-16 | 1 | -7/+1 |
|\ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / | |||||
| * | | | | | | | | | | Merge remote-tracking branch 'origin/5.5' into 10.0 | vicentiu | 2017-01-06 | 1 | -7/+1 |
| |\ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / | | | | | | / / / / / | | |_|_|_|/ / / / / | |/| | | | | | | | | |||||
| | * | | | | | | | | Numerous issues in mysqld_safe | Sergei Golubchik | 2016-12-22 | 1 | -7/+1 |
| | | |_|_|_|_|_|/ | | |/| | | | | | | |||||
* | | | | | | | | | Merge branch '10.0' into 10.1 | Sergei Golubchik | 2016-09-29 | 1 | -1/+1 |
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / | |||||
| * | | | | | | | | Merge branch '5.5' into 10.0 | Sergei Golubchik | 2016-09-29 | 1 | -1/+1 |
| |\ \ \ \ \ \ \ \ | | |/ / / / / / / | |||||
| | * | | | | | | | mysqld_safe: close stdout and stderr | Sergei Golubchik | 2016-09-29 | 1 | -1/+1 |
| | | |_|_|_|_|/ | | |/| | | | | | |||||
* | | | | | | | | Merge branch '10.0' into 10.1 | Sergei Golubchik | 2016-09-28 | 1 | -1/+1 |
|\ \ \ \ \ \ \ \ | |/ / / / / / / | |||||
| * | | | | | | | Merge branch '5.5' into 10.0 | Sergei Golubchik | 2016-09-27 | 1 | -1/+1 |
| |\ \ \ \ \ \ \ | | |/ / / / / / | | | | | / / / | | |_|_|/ / / | |/| | | | | | |||||
| | * | | | | | Merge branch 'mysql/5.5' into 5.5 | Sergei Golubchik | 2016-09-11 | 1 | -1/+1 |
| | |\ \ \ \ \ | | | |_|_|_|/ | | |/| | | | | |||||
| | | * | | | | Bug#24464380 PRIVILEGE ESCALATION USING MYSQLD_SAFE | Terje Rosten | 2016-08-25 | 1 | -1/+1 |
| | | |/ / / | |||||
| | | * | | | local merge. | Nirbhay Choubey | 2013-04-09 | 1 | -1/+7 |
| | | |\ \ \ | |||||
| | | | * | | | Backporting patch for bug#15852074. | Nirbhay Choubey | 2013-04-09 | 1 | -1/+7 |
| | | * | | | | Fix previous merge: 'kill -0' (check PID exists) was changed to 'kill -9', | Jonathan Perkin | 2009-12-16 | 1 | -1/+1 |
| | | * | | | | Backport WL#4085: Merge revno:2617.56.29 from 6.0. | Alexander Nozdrin | 2009-10-06 | 1 | -119/+59 |
| | | |/ / / | |||||
| | | * | | | merge patch for bug#31785 | Daniel Fischer | 2009-07-02 | 1 | -5/+12 |
| | | * | | | Merge zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.0-build | cmiller@zippy.cornsilk.net | 2008-03-26 | 1 | -5/+28 |
| | | |\ \ \ | |||||
| | | | * | | | Suggestion of Tim. Avoid unnecessary sleep. | cmiller@zippy.cornsilk.net | 2008-03-19 | 1 | -1/+1 |
| | | | * | | | Bug#30378: mysql.server needs to skip wait_for_pid() when mysqld \ | cmiller@zippy.cornsilk.net | 2008-03-19 | 1 | -4/+27 |
| | | * | | | | Merge production.mysql.com:/usersnfs/jperkin/bk/bug-27995/5.0 | jperkin@production.mysql.com | 2007-11-05 | 1 | -1/+1 |
| | | |\ \ \ \ | | | | |/ / / | |||||
| | | | * | | | Provide better feedback to the user when unable to find MySQL files | jperkin@production.mysql.com | 2007-11-05 | 1 | -1/+1 |
| | | * | | | | Makefile.am, make_binary_distribution.sh: | kent@mysql.com/kent-amd64.(none) | 2007-09-27 | 1 | -1/+1 |