Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge 10.3 into 10.4 | Marko Mäkelä | 2018-11-06 | 1 | -12/+19 |
|\ | |||||
| * | Merge 10.2 into 10.3 | Marko Mäkelä | 2018-11-06 | 1 | -12/+19 |
| |\ | |||||
| | * | Merge 10.1 into 10.2 | Marko Mäkelä | 2018-11-06 | 1 | -12/+19 |
| | |\ | |||||
| | | * | 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 10.3 into 10.4 | Marko Mäkelä | 2018-10-05 | 3 | -6/+17 |
|\ \ \ \ \ \ | |/ / / / / | |||||
| * | | | | | Merge branch '10.2' into 10.3 | Sergei Golubchik | 2018-09-28 | 3 | -6/+17 |
| |\ \ \ \ \ | | |/ / / / | |||||
| | * | | | | MDEV-14560 Extra engines enabled through additional config are not loaded on ... | Sergei Golubchik | 2018-09-22 | 2 | -0/+2 |
| | * | | | | MDEV-14560 Extra engines enabled through additional config are not loaded on ... | Sergei Golubchik | 2018-09-21 | 3 | -6/+15 |
| | * | | | | Merge 10.1 into 10.2 | Marko Mäkelä | 2018-08-02 | 1 | -0/+2 |
| | |\ \ \ \ | | | |/ / / | |||||
| | | * | | | Merge branch '10.0' into bb-10.1-merge-sanja | Oleksandr Byelkin | 2018-07-25 | 1 | -0/+2 |
| | | |\ \ \ | | | | |/ / | |||||
| | | | * | | MDEV-11790 WITHOUT_SERVER installs mysqld_safe_helper | Sergei Golubchik | 2018-07-19 | 1 | -0/+2 |
* | | | | | | Merge 10.3 into 10.4 | Marko Mäkelä | 2018-08-16 | 3 | -4/+17 |
|\ \ \ \ \ \ | |/ / / / / | |||||
| * | | | | | MDEV-14900 Upstream 10.3 debian patches | Sergei Golubchik | 2018-08-12 | 3 | -4/+17 |
* | | | | | | Merge remote-tracking branch 'origin/10.3' into 10.4 | Alexander Barkov | 2018-07-03 | 5 | -6/+10 |
|\ \ \ \ \ \ | |/ / / / / | |||||
| * | | | | | Merge branch '10.2' into 10.3 | Sergei Golubchik | 2018-06-30 | 4 | -3/+5 |
| |\ \ \ \ \ | | |/ / / / | |||||
| | * | | | | Merge branch '10.1' into 10.2 | Sergei Golubchik | 2018-06-21 | 4 | -3/+5 |
| | |\ \ \ \ | | | |/ / / | |||||
| | | * | | | Merge branch '10.0-galera' into 10.1 | Vicențiu Ciorbaru | 2018-06-12 | 4 | -3/+5 |
| | | |\ \ \ | |||||
| | | | * \ \ | Merge remote-tracking branch 'origin/5.5-galera' into 10.0-galera | Jan Lindström | 2018-05-07 | 2 | -2/+3 |
| | | | |\ \ \ | |||||
| | | | | * \ \ | Merge tag 'mariadb-5.5.60' into 5.5-galera | Jan Lindström | 2018-04-24 | 1 | -22/+21 |
| | | | | |\ \ \ | | | | | | | |/ | | | | | | |/| | |||||
| | | | | * | | | wsrep.cnf - wsrep_on=1 by default | Jakub Dorňák | 2017-04-30 | 1 | -0/+3 |
| | | | | * | | | Merge tag 'mariadb-5.5.55' into bb-5.5-sachin-merge | Sachin Setiya | 2017-04-18 | 8 | -44/+64 |
| | | | | |\ \ \ | |||||
| | | | | * \ \ \ | 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-5.5.46' into 5.5-galera | Nirbhay Choubey | 2015-10-13 | 1 | -7/+7 |
| | | | | |\ \ \ \ \ \ \ \ | |||||
| | | | * | \ \ \ \ \ \ \ \ | 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 | 2 | -10/+4 |
| | | | |\ \ \ \ \ \ \ \ \ \ | |||||
| | | | * \ \ \ \ \ \ \ \ \ \ | Merge tag 'mariadb-10.0.30' into bb-sachin-10.0-galera-merge | Sachin Setiya | 2017-03-17 | 5 | -38/+24 |
| | | | |\ \ \ \ \ \ \ \ \ \ \ | |||||
| | | | * \ \ \ \ \ \ \ \ \ \ \ | Merge tag 'mariadb-10.0.29' into 10.0-galera | Nirbhay Choubey | 2017-01-13 | 7 | -9/+52 |
| | | | |\ \ \ \ \ \ \ \ \ \ \ \ | |||||
| | | | * \ \ \ \ \ \ \ \ \ \ \ \ | Merge tag 'mariadb-10.0.28' into 10.0-galera | Nirbhay Choubey | 2016-10-28 | 1 | -1/+1 |
| | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| | | | * \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch '10.0' into 10.0-galera | Nirbhay Choubey | 2016-04-29 | 1 | -3/+3 |
| | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| | | | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge tag 'mariadb-10.0.23' into 10.0-galera | Nirbhay Choubey | 2015-12-19 | 2 | -1/+19 |
| | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge 10.2 into 10.3 | Marko Mäkelä | 2018-06-07 | 1 | -3/+5 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / / / / / / | |||||
| | * | | | | | | | | | | | | | | | | | | Merge 10.1 into 10.2 | Marko Mäkelä | 2018-06-06 | 1 | -2/+9 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / / / / / / / / / | |||||
| | | * | | | | | | | | | | | | | | | | | MDEV-16303 - do not install wsrep.ini on Windows | Vladislav Vaintroub | 2018-05-29 | 1 | -2/+9 |
| | * | | | | | | | | | | | | | | | | | | MDEV-15474 Update server.cnf section to mariadb-10.2 | Ian Gilfillan | 2018-03-07 | 1 | -2/+2 |
| | * | | | | | | | | | | | | | | | | | | MDEV-15448 Remove "innodb_additional_mem_pool_size" setting from my-innodb-he... | Elena Stepanova | 2018-03-03 | 5 | -11/+0 |
* | | | | | | | | | | | | | | | | | | | | Update server.cnf section to mariadb-10.4 | Ian Gilfillan | 2018-05-07 | 1 | -2/+2 |
|/ / / / / / / / / / / / / / / / / / / | |||||
* | | | | | | | | | | | | | | | | | | | MDEV-15474 Update server.cnf section to mariadb-10.3 | Ian Gilfillan | 2018-03-07 | 1 | -2/+2 |
* | | | | | | | | | | | | | | | | | | | Merge bb-10.2-ext into 10.3 | Marko Mäkelä | 2018-02-15 | 3 | -25/+23 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge remote-tracking branch 'origin/10.2' into bb-10.2-ext | Alexander Barkov | 2018-02-08 | 3 | -25/+23 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / / / / / / | |||||
| | * | | | | | | | | | | | | | | | | | | Merge branch 'github/10.1' into 10.2 | Sergei Golubchik | 2018-02-06 | 3 | -25/+23 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / / / / / / / / / | |||||
| | | * | | | | | | | | | | | | | | | | | 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 |
| | | | | | |_|_|_|_|_|_|_|_|_|_|_|/ | | | | | |/| | | | | | | | | | | | | |||||
| | | * | | | | | | | | | | | | | | | systemd: revert to KillMode=control-group for galera | Daniel Black | 2018-01-29 | 2 | -2/+0 |
* | | | | | | | | | | | | | | | | | | Remove compiler warnings | Monty | 2018-01-30 | 1 | -0/+5 |