Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | 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 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 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
* | | | | | | | | | | | | | | | | | MDEV-16303 - do not install wsrep.ini on Windows | Vladislav Vaintroub | 2018-05-29 | 1 | -2/+9 |
* | | | | | | | | | | | | | | | | | 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 |
* | | | | | | | | | | | | | | | Generate and install sysusers and tmpfiles configuration | Christian Hesse | 2017-12-20 | 3 | -0/+17 |
* | | | | | | | | | | | | | | | MDEV-13809: [service] should [Service] in systemd service files | Daniel Black | 2017-12-19 | 2 | -4/+6 |
* | | | | | | | | | | | | | | | MDEV-12128: systemd - add Documentation= directives | Daniel Black | 2017-12-19 | 2 | -2/+6 |
* | | | | | | | | | | | | | | | Merge branch '10.0' 10.1 | Sergei Golubchik | 2017-04-28 | 2 | -10/+4 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / | |||||
| * | | | | | | | | | | | | | | Merge branch '5.5' into 10.0 | Sergei Golubchik | 2017-04-21 | 2 | -10/+4 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / | | | | | | | | / / / / / / / | | |_|_|_|_|_|/ / / / / / / | |/| | | | | | | | | | | | | |||||
| | * | | | | | | | | | | | | Merge remote-tracking branch 'mysql/5.5' into 5.5mariadb-5.5.55 | Sergei Golubchik | 2017-04-11 | 2 | -10/+4 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ | |||||
| | | * | | | | | | | | | | | | 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 | 2 | -2/+7 |
| | | * | | | | | | | | | | | | Bug#24707666: DEFAULT SETTING FOR SECURE-FILE-PRIV SHOULD BE | Arun Kuruvila | 2016-09-28 | 1 | -1/+6 |
| | | * | | | | | | | | | | | | Bug#24464380 PRIVILEGE ESCALATION USING MYSQLD_SAFE | Terje Rosten | 2016-08-18 | 1 | -1/+1 |
* | | | | | | | | | | | | | | | Merge 10.0 into 10.1 | Marko Mäkelä | 2017-03-09 | 2 | -32/+5 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / | |||||
| * | | | | | | | | | | | | | | Merge branch 'bb-10.0-vicentiu' into 10.0mariadb-10.0.30 | Vicențiu Ciorbaru | 2017-03-06 | 4 | -37/+17 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch '5.5' into 10.0 | Vicențiu Ciorbaru | 2017-03-03 | 4 | -37/+17 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / / / / / | | | | | | | | | / / / / / / / | | | |_|_|_|_|_|/ / / / / / / | | |/| | | | | | | | | | | | | |||||
| | | * | | | | | | | | | | | | delete the installation warning for CentOS4/RHEL4 | Sergei Golubchik | 2017-02-27 | 1 | -26/+0 |
| | | * | | | | | | | | | | | | MDEV-11789 MariaDB fails to restart after 10.0.29-1.el7 update | Sergei Golubchik | 2017-02-27 | 1 | -5/+4 |
| | | * | | | | | | | | | | | | MDEV-12074 selinux build failure on Fedora 24 | Sergei Golubchik | 2017-02-27 | 3 | -3/+3 |
| | | * | | | | | | | | | | | | backported build-tags from 10.2 to ensure that 'make tags' works again | Monty | 2017-01-27 | 1 | -8/+12 |
* | | | | | | | | | | | | | | | properly set paths in systemd unit files | Christian Hesse | 2017-03-07 | 3 | -15/+17 |
* | | | | | | | | | | | | | | | spelling fixes | klemens | 2017-03-07 | 7 | -10/+10 |
* | | | | | | | | | | | | | | | Merge 10.0 into 10.1 | Marko Mäkelä | 2017-03-03 | 2 | -1/+7 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / | |||||
| * | | | | | | | | | | | | | | MDEV-11610: support-files/mysql-log-rotate.sh not binlog either | Daniel Black | 2017-03-02 | 1 | -1/+2 |
| * | | | | | | | | | | | | | | MDEV-11386: Advance Toochain library cache workaround (temporary) | Daniel Black | 2017-03-02 | 1 | -0/+5 |
| |/ / / / / / / / / / / / / | |||||
* | | | | | | | | | | | | | | selinux fixes for 10.0->10.1 merge | Sergei Golubchik | 2017-01-17 | 3 | -19/+19 |
* | | | | | | | | | | | | | | Post merge review fixes | Vicențiu Ciorbaru | 2017-01-17 | 6 | -225/+20 |
* | | | | | | | | | | | | | | Merge branch '10.0' into 10.1 | Vicențiu Ciorbaru | 2017-01-16 | 7 | -8/+240 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / | |||||
| * | | | | | | | | | | | | | Merge branch '5.5' into 10.0 | Vicențiu Ciorbaru | 2017-01-12 | 6 | -2/+51 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / |