summaryrefslogtreecommitdiff
path: root/support-files
Commit message (Expand)AuthorAgeFilesLines
* Merge 10.1 into 10.2Marko Mäkelä2018-08-021-0/+2
|\
| * Merge branch '10.0' into bb-10.1-merge-sanjaOleksandr Byelkin2018-07-251-0/+2
| |\
| | * MDEV-11790 WITHOUT_SERVER installs mysqld_safe_helperSergei Golubchik2018-07-191-0/+2
* | | Merge branch '10.1' into 10.2Sergei Golubchik2018-06-214-3/+5
|\ \ \ | |/ /
| * | Merge branch '10.0-galera' into 10.1Vicențiu Ciorbaru2018-06-124-3/+5
| |\ \
| | * \ Merge remote-tracking branch 'origin/5.5-galera' into 10.0-galeraJan Lindström2018-05-072-2/+3
| | |\ \
| | | * \ Merge tag 'mariadb-5.5.60' into 5.5-galeraJan Lindström2018-04-241-22/+21
| | | |\ \
| | | * | | wsrep.cnf - wsrep_on=1 by defaultJakub Dorňák2017-04-301-0/+3
| | | * | | Merge tag 'mariadb-5.5.55' into bb-5.5-sachin-mergeSachin Setiya2017-04-188-44/+64
| | | |\ \ \
| | | * \ \ \ 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-5.5.46' into 5.5-galeraNirbhay Choubey2015-10-131-7/+7
| | | |\ \ \ \ \ \ \ \
| | * | \ \ \ \ \ \ \ \ 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-302-10/+4
| | |\ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ Merge tag 'mariadb-10.0.30' into bb-sachin-10.0-galera-mergeSachin Setiya2017-03-175-38/+24
| | |\ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ Merge tag 'mariadb-10.0.29' into 10.0-galeraNirbhay Choubey2017-01-137-9/+52
| | |\ \ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ \ Merge tag 'mariadb-10.0.28' into 10.0-galeraNirbhay Choubey2016-10-281-1/+1
| | |\ \ \ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch '10.0' into 10.0-galeraNirbhay Choubey2016-04-291-3/+3
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge tag 'mariadb-10.0.23' into 10.0-galeraNirbhay Choubey2015-12-192-1/+19
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
* | | \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge 10.1 into 10.2Marko Mäkelä2018-06-061-2/+9
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / / /
| * | | | | | | | | | | | | | | | | MDEV-16303 - do not install wsrep.ini on WindowsVladislav Vaintroub2018-05-291-2/+9
* | | | | | | | | | | | | | | | | | MDEV-15474 Update server.cnf section to mariadb-10.2Ian Gilfillan2018-03-071-2/+2
* | | | | | | | | | | | | | | | | | MDEV-15448 Remove "innodb_additional_mem_pool_size" setting from my-innodb-he...Elena Stepanova2018-03-035-11/+0
* | | | | | | | | | | | | | | | | | Merge branch 'github/10.1' into 10.2Sergei Golubchik2018-02-063-25/+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
| | | | |_|_|_|_|_|_|_|_|_|_|_|/ | | | |/| | | | | | | | | | | |
| * | | | | | | | | | | | | | | systemd: revert to KillMode=control-group for galeraDaniel Black2018-01-292-2/+0
* | | | | | | | | | | | | | | | Merge remote-tracking branch 'origin/10.1' into 10.2Vicențiu Ciorbaru2017-12-223-0/+17
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / /
| * | | | | | | | | | | | | | | Generate and install sysusers and tmpfiles configurationChristian Hesse2017-12-203-0/+17
* | | | | | | | | | | | | | | | Merge 10.1 to 10.2Marko Mäkelä2017-12-192-6/+12
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / /
| * | | | | | | | | | | | | | | MDEV-13809: [service] should [Service] in systemd service filesDaniel Black2017-12-192-4/+6
| * | | | | | | | | | | | | | | MDEV-12128: systemd - add Documentation= directivesDaniel Black2017-12-192-2/+6
* | | | | | | | | | | | | | | | apparmor: allow to read /etc/mysql/mariadb.conf.d/*Guido Günther2017-09-181-0/+2
* | | | | | | | | | | | | | | | Don't create tags for .xz filesMonty2017-06-301-1/+1
* | | | | | | | | | | | | | | | Merge branch '10.1' into 10.2Sergei Golubchik2017-05-092-10/+4
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / /
| * | | | | | | | | | | | | | | Merge branch '10.0' 10.1Sergei Golubchik2017-04-282-10/+4
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / /
| | * | | | | | | | | | | | | | Merge branch '5.5' into 10.0Sergei Golubchik2017-04-212-10/+4
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / / / / / | | | | | | | | | / / / / / / / | | | |_|_|_|_|_|/ / / / / / / | | |/| | | | | | | | | | | |
| | | * | | | | | | | | | | | Merge remote-tracking branch 'mysql/5.5' into 5.5mariadb-5.5.55Sergei Golubchik2017-04-112-10/+4
| | | |\ \ \ \ \ \ \ \ \ \ \ \
| | | | * | | | | | | | | | | | 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-062-2/+7
| | | | * | | | | | | | | | | | Bug#24707666: DEFAULT SETTING FOR SECURE-FILE-PRIV SHOULD BEArun Kuruvila2016-09-281-1/+6
| | | | * | | | | | | | | | | | Bug#24464380 PRIVILEGE ESCALATION USING MYSQLD_SAFETerje Rosten2016-08-181-1/+1
* | | | | | | | | | | | | | | | Merge branch '10.1' into 10.2Sergei Golubchik2017-03-309-55/+36
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / /
| * | | | | | | | | | | | | | | Merge 10.0 into 10.1Marko Mäkelä2017-03-092-32/+5
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / /
| | * | | | | | | | | | | | | | Merge branch 'bb-10.0-vicentiu' into 10.0mariadb-10.0.30Vicențiu Ciorbaru2017-03-064-37/+17
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | * \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch '5.5' into 10.0Vicențiu Ciorbaru2017-03-034-37/+17
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | |/ / / / / / / / / / / / / | | | | | | | | | | / / / / / / / | | | | |_|_|_|_|_|/ / / / / / / | | | |/| | | | | | | | | | | |
| | | | * | | | | | | | | | | | delete the installation warning for CentOS4/RHEL4Sergei Golubchik2017-02-271-26/+0