summaryrefslogtreecommitdiff
path: root/support-files
Commit message (Collapse)AuthorAgeFilesLines
* Merge 10.1 into 10.1Marko Mäkelä2019-02-021-1/+5
|\ | | | | | | This is joint work with Oleksandr Byelkin.
| * Merge branch '5.5' into 10.0Oleksandr Byelkin2019-01-281-1/+5
| |\
| | * MDEV-18059 `support-files/mysql.server.sh stop` must run as rootSergei Golubchik2019-01-231-1/+5
| | | | | | | | | | | | don't run `su - mysql` is $USER is already mysql
| * | Revert commit b2f39a5f567d006000aad8b431267298cf81b569 wrongJan Lindström2018-11-012-132/+0
| | | | | | | | | | | | branch.
| * | Add missing wsrep.cnf.shJan Lindström2018-11-012-0/+132
| | |
* | | MDEV-18379: Unification of check for IPv6Julius Goryavsky2019-01-262-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This patch contains the port of the MDEV-18379 patch for 10.1 branch, but also includes a number of changes made within MDEV-17835, which are necessary for the normal operation of tests that use IPv6: 1) Fixed flaws in the galera_3nodes mtr suite control scripts, because of which they could not work with mariabackup. 2) Fixed numerous bugs in the SST scripts and in the mtr test files (galera_3nodes mtr suite) that prevented the use of Galera with IPv6 addresses. 3) Fixed flaws in tests for rsync and mysqldump (for galera_3nodes mtr tests suite). These tests were not performed successfully without these fixes. 4) Currently, the three-node mtr suite for Galera (galera_3nodes) uses a separate IPv6 availability check using the "have_ipv6.inc" file. This check duplicates a more accurate check at suite.pm level, which can be used by including the file "check_ipv6.inc". This patch removes this discrepancy between suites. 5) GAL-501 test in the galera_3nodes suite does not contain the option "--bind-address=::" which is needed for the test to work correctly with IPv6 (at least on some systems), since without it the server will not wait for connections on the IPv6 interface. https://jira.mariadb.org/browse/MDEV-18379 and partially https://jira.mariadb.org/browse/MDEV-17835
* | | Merge branch '10.0' into 10.1Sergei Golubchik2018-10-301-12/+19
|\ \ \ | |/ /
| * | Merge branch '5.5' into 10.0Sergei Golubchik2018-10-271-12/+19
| |\ \ | | |/
| | * Bug#27919254 MYSQL USER ESCALATES ITS PRIVILEGE BY PLACING ARBITRARY PIDS ↵Sergei Golubchik2018-10-241-12/+19
| | | | | | | | | | | | INTO ITS PID FILES
* | | 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
| | | | | | | | | | | | | | | | | | | | | Don't install server files if WITHOUT_SERVER is specified. "Server files" are defined as files going into the MariaDB-Server RPM, that is files in the components Server, ManPagesServer, Server_Scripts, IniFiles, SuportFiles, and Readme.
* | | 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
| | | | | | | | | | | | | | | | | | | | From: https://github.com/devexp-db/mariadb/blob/f27/mariadb-galera.cnf.patch
| | * | | Merge tag 'mariadb-5.5.55' into bb-5.5-sachin-mergeSachin Setiya2017-04-188-44/+64
| | |\ \ \ | | | | | | | | | | | | | | | | | | Signed-off-by: Sachin Setiya <sachin.setiya@mariadb.com>
| | * \ \ \ 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
| |\ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|_|/ | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: storage/innobase/lock/lock0lock.cc storage/xtradb/lock/lock0lock.cc storage/xtradb/lock/lock0wait.cc support-files/mysql.server.sh
| * | | | | | | | | | Merge tag 'mariadb-10.0.31' into 10.0-galeraSachin Setiya2017-05-302-10/+4
| |\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Sachin Setiya <sachin.setiya@mariadb.com>
| * \ \ \ \ \ \ \ \ \ \ Merge tag 'mariadb-10.0.30' into bb-sachin-10.0-galera-mergeSachin Setiya2017-03-175-38/+24
| |\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Sachin Setiya <sachin.setiya@mariadb.com>
| * \ \ \ \ \ \ \ \ \ \ \ 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
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
* | | | | | | | | | | | | | | | | MDEV-16303 - do not install wsrep.ini on WindowsVladislav Vaintroub2018-05-291-2/+9
| | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | 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
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When galera is used we want a stop to kill off not only the mysqld process but the entire process group created by galera to perform sst or wsrep_notify_cmd.`
* | | | | | | | | | | | | | | Generate and install sysusers and tmpfiles configurationChristian Hesse2017-12-203-0/+17
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Using systemd we can automate creating users and directories. So generate and install the configuration files. Signed-off-by: Vicențiu Ciorbaru <vicentiu@mariadb.org> Small change in cmake/install_layout.cmake compared to original contributor patch to also install SYSTEMD_SYSUSERS and SYSTEMD_TMPFILES directories. The variables were being set, but the loop which defines the final install files was not updated.
* | | | | | | | | | | | | | | 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
| | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | 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 ↵Terje Rosten2017-02-131-13/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | SERVER Fix of Bug#25088048 caused paths to be relative, not absolute, this proved to be problematic. Fix is to still ignore current working directory, however switch to using full path of basedir, which is set to parent directory of bin/ directory where mysqld_safe is located. References to legacy tool mysql_print_defaults are removed, only my_print_defaults is used these days. This will also fix: Bug#11745176 (11192) MYSQLD_SAFE ONLY EVALUATES --DEFAULTS-FILE OPTION WHEN IT IS THE FIRST OP Bug#23013510 (80866) MYSQLD_SAFE SHOULD NOT SEARCH $MY_BASEDIR_VERSION/VAR AS DATADIR Bug#25244898 (84173) MYSQLD_SAFE --NO-DEFAULTS & SILENTLY DOES NOT WORK ANY MORE Bug#25261472 (84219) INITSCRIPT ERRORS WHEN LAUCHING MYSQLD_SAFE IN NON DEFAULT BASEDIR Bug#25319392 (84263) MYSQL.SERVER (MYSQL SERVER STARTUP SCRIPT) CAN NOT WORK,AND EXPORT SOME ERROR. Bug#25319457 MYSQLD_SAFE MIGHT FAIL IF $DATADIR HAS TRAILING / Bug#25341981 MYSQLD_SAFE ASSUMES INCORRECT BASEDIR WHEN EXECUTED WITH ABSOLUTE PATH Bug#25356221 (84427) MYSQLD_SAFE FAILS TO START WHEN USING A FIFO FOR LOG-ERROR (REGRESSION) Bug#25365194 (84447) MYSQLD_SAFE DOESN'T CHECK EXISTENCE OF GIVEN BASEDIR PARAMETER Bug#25377815 ERRORS WHILE STARTING MYSQLD_SAFE WITH SYM LINK ENABLED
| | | * | | | | | | | | | | | BUG#13788154 INIT.D MYSQL SCRIPT CREATED BY MYSQL SOLARIS PACKAGE FAILS TO ↵Terje Rosten2016-12-062-2/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | RUN DUE TO USE OF PIDOF pidof is Linuxism, prefer pgrep on other UNIX systems.
| | | * | | | | | | | | | | | Bug#24707666: DEFAULT SETTING FOR SECURE-FILE-PRIV SHOULD BEArun Kuruvila2016-09-281-1/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | RESTRICTED IN ALL GA RELEASES Back port of WL#6782 to 5.5 and 5.6. This also includes back port of Bug#20771331, Bug#20741572 and Bug#20770671. Bug#24695274 and Bug#24679907 are also handled along with this.
| | | * | | | | | | | | | | | Bug#24464380 PRIVILEGE ESCALATION USING MYSQLD_SAFETerje Rosten2016-08-181-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Argument to malloc-lib must be included in restricted list of directories, symlink guards added, and mysqld and mysqld-version options restricted to command line only. Don't redirect errors to stderr.
* | | | | | | | | | | | | | | Merge 10.0 into 10.1Marko Mäkelä2017-03-092-32/+5
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Also, implement MDEV-11027 a little differently from 5.5 and 10.0: recv_apply_hashed_log_recs(): Change the return type back to void (DB_SUCCESS was always returned). Report progress also via systemd using sd_notifyf().
| * | | | | | | | | | | | | | 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
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | it went out of support five years ago
| | | * | | | | | | | | | | | MDEV-11789 MariaDB fails to restart after 10.0.29-1.el7 updateSergei Golubchik2017-02-271-5/+4
| | | | | | | | | | | | | | |
| | | * | | | | | | | | | | | MDEV-12074 selinux build failure on Fedora 24Sergei Golubchik2017-02-273-3/+3
| | | | | | | | | | | | | | |
| | | * | | | | | | | | | | | backported build-tags from 10.2 to ensure that 'make tags' works againMonty2017-01-271-8/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | with xemacs