Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'github/10.0-galera' into 10.1 | Sergei Golubchik | 2015-11-19 | 1 | -0/+8 |
|\ | |||||
| * | Merge tag 'mariadb-10.0.22' into 10.0-galera | Nirbhay Choubey | 2015-10-31 | 1 | -9/+4 |
| |\ | |||||
| * \ | Merge branch '5.5-galera' into 10.0-galera | Nirbhay Choubey | 2015-09-25 | 1 | -0/+8 |
| |\ \ | |||||
| | * | | MDEV-8803: Debian jessie 8.2 + MariaDB 10.1.7 + GaleraCluster | Nirbhay Choubey | 2015-09-15 | 1 | -0/+8 |
| | * | | Merge branch '5.5' into 5.5-galera | Nirbhay Choubey | 2015-02-18 | 1 | -0/+3 |
| | |\ \ | |||||
| | * | | | MDEV-7319 : Galera bootstrap (/etc/init.d/mysql bootstrap) | Nirbhay Choubey | 2014-12-20 | 1 | -1/+2 |
| | * | | | bzr merge -r3997..4010 codership-mysql/5.5 | Nirbhay Choubey | 2014-08-06 | 1 | -1/+4 |
| | * | | | Local merge of mariadb-5.5.39 | Nirbhay Choubey | 2014-08-06 | 1 | -0/+5 |
| | |\ \ \ | |||||
| | * \ \ \ | Merge from lp:maria/5.5 to maria-5.5.37 release revision 4154. | Jan Lindström | 2014-04-16 | 1 | -2/+7 |
| | |\ \ \ \ | |||||
| | * \ \ \ \ | Merge from maria/5.5 (-rtag:mariadb-5.5.36). | Nirbhay Choubey | 2014-02-25 | 1 | -66/+100 |
| | |\ \ \ \ \ | |||||
| | * | | | | | | Merging revision 3839..3932 from codership-mysql/5.5. | Nirbhay Choubey | 2014-01-09 | 1 | -28/+1 |
| | * | | | | | | MDEV#5384: Update init script in MariaDB Cluster | Nirbhay Choubey | 2013-12-05 | 1 | -2/+2 |
| | * | | | | | | Merged revisions 3916--3921 from lp:~codership/codership-mysql/5.5-23 | Jan Lindström | 2013-09-26 | 1 | -2/+2 |
| | * | | | | | | Merge with mariadb 5.5: bzr merge lp:maria/5.5 --rtag:mariadb-5.5.32 | Seppo Jaakola | 2013-08-21 | 1 | -1/+7 |
| | |\ \ \ \ \ \ | |||||
| | * | | | | | | | References: MDEV-4572 - merge with lp:codership-mysql/5.5-23 revisions 3874..... | Seppo Jaakola | 2013-06-15 | 1 | -2/+15 |
| * | | | | | | | | Merge branch '10.0' into 10.0-galera | Nirbhay Choubey | 2015-02-18 | 1 | -0/+3 |
| |\ \ \ \ \ \ \ \ | | | |_|_|_|_|/ / | | |/| | | | | | | |||||
* | | | | | | | | | Merge branch '10.0' into 10.1 | Sergei Golubchik | 2015-11-19 | 1 | -9/+4 |
|\ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|/ | |/| | | | | | | | |||||
| * | | | | | | | | MDEV-8543 mysql.server script not correctly handle --pid-file.mariadb-10.0.22 | Sergei Golubchik | 2015-10-28 | 1 | -9/+4 |
| | |/ / / / / / | |/| | | | | | | |||||
* | | | | | | | | MDEV-9007: systemd - service mariadb bootstrap | Daniel Black | 2015-11-02 | 1 | -0/+4 |
* | | | | | | | | MDEV-427/MDEV-5713 Add systemd script with notify functionality | Sergey Vojtovich | 2015-10-12 | 1 | -0/+5 |
* | | | | | | | | Merge branch '10.0' into 10.1 | Sergei Golubchik | 2015-03-07 | 1 | -0/+3 |
|\ \ \ \ \ \ \ \ | |/ / / / / / / | |||||
| * | | | | | | | MDEV-7478 log-basename unpredictable behavior in standalone mode | Sergei Golubchik | 2015-02-09 | 1 | -0/+3 |
| | |_|_|_|_|/ | |/| | | | | | |||||
* | | | | | | | Merge 10.0-galera into 10.1 | Sergei Golubchik | 2015-02-06 | 1 | -1/+2 |
|\ \ \ \ \ \ \ | | |/ / / / / | |/| | | | | | |||||
| * | | | | | | MDEV-7319 : Galera bootstrap (/etc/init.d/mysql bootstrap) | Nirbhay Choubey | 2014-12-20 | 1 | -1/+2 |
| * | | | | | | bzr merge -r4104..4120 codership/5.6/ | Nirbhay Choubey | 2014-08-12 | 1 | -1/+4 |
| * | | | | | | bzr merge -r4346 maria/10.0 (maria-10.0.13) | Nirbhay Choubey | 2014-08-11 | 1 | -0/+5 |
| |\ \ \ \ \ \ | | |/ / / / / | |||||
| * | | | | | | bzr merge -r4209 maria/10.0. | Nirbhay Choubey | 2014-05-21 | 1 | -0/+5 |
| |\ \ \ \ \ \ | | | |_|_|_|/ | | |/| | | | | |||||
| * | | | | | | Merging mariadb-10.0.10. | Nirbhay Choubey | 2014-04-08 | 1 | -4/+2 |
| |\ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ | * bzr merge -rtag:mariadb-10.0.9 maria/10.0 | Nirbhay Choubey | 2014-03-26 | 1 | -65/+72 |
| |\ \ \ \ \ \ \ | | | |_|_|_|_|/ | | |/| | | | | | |||||
| * | | | | | | | MDEV#5759 Init script contains syntax error | Nirbhay Choubey | 2014-02-27 | 1 | -1/+5 |
| * | | | | | | | * Merged revisions: 3431, 3435..3457, 3459, 3460 from maria-5.5-galera. | Nirbhay Choubey | 2014-01-30 | 1 | -1/+8 |
| * | | | | | | | Merged revisions 3418..3424 from mariadb-galera-5.5 | Seppo Jaakola | 2013-10-07 | 1 | -0/+2 |
| | |_|_|_|_|/ | |/| | | | | | |||||
* | | | | | | | Merge 10.0.14 into 10.1 | Sergei Golubchik | 2014-10-15 | 1 | -0/+5 |
|\ \ \ \ \ \ \ | | |_|_|_|/ / | |/| | | | | | |||||
| * | | | | | | MDEV-6428 [PATCH] MariaDB start script doesn't realize failure of MariaDB sta... | Sergei Golubchik | 2014-07-26 | 1 | -0/+5 |
| | |_|_|/ / | |/| | | | | |||||
* | | | | | | cleanup: galera merge, simple changes | Sergei Golubchik | 2014-10-01 | 1 | -9/+1 |
* | | | | | | wsrep-related changes: removed some unnecessary files & minor modifications. | Nirbhay Choubey | 2014-09-25 | 1 | -2/+3 |
* | | | | | | MDEV-6247: Merge 10.0-galera to 10.1. | Jan Lindström | 2014-08-26 | 1 | -2/+18 |
|/ / / / / | |||||
* | | | | | MDEV-5068 import file from init script | Sergei Golubchik | 2014-04-10 | 1 | -0/+5 |
| |_|/ / |/| | | | |||||
* | | | | MDEV-5892 Centos startup script is broken | Sergei Golubchik | 2014-03-19 | 1 | -4/+1 |
| |/ / |/| | | |||||
* | | | MDEV-5580 /etc/init.d/mysql exits too early | Sergei Golubchik | 2014-02-17 | 1 | -59/+66 |
|/ / | |||||
* | | mysql-5.5.32 merge | Sergei Golubchik | 2013-07-16 | 1 | -1/+7 |
|\ \ | |/ |/| | |||||
| * | local merge. | Nirbhay Choubey | 2013-04-09 | 1 | -1/+7 |
| |\ | |||||
| | * | Backporting patch for bug#15852074. | Nirbhay Choubey | 2013-04-09 | 1 | -1/+7 |
* | | | merge. | Sergei Golubchik | 2010-11-25 | 1 | -3/+41 |
|\ \ \ | |/ / |/| | | |||||
| * | | Automatic merge | Michael Widenius | 2009-10-23 | 1 | -1/+12 |
| |\ \ | |||||
| | * | | Fixes for binary distribution in tar file | Michael Widenius | 2009-10-23 | 1 | -1/+12 |
| | |/ | |||||
| * | | Add `configtest' option to the init script to check for a valid my.cnf file. | Peter Lieverdink | 2009-10-16 | 1 | -2/+29 |
| |/ | |||||
* | | 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 |