summaryrefslogtreecommitdiff
path: root/support-files
Commit message (Collapse)AuthorAgeFilesLines
* Merge 10.2 into 10.3Marko Mäkelä2020-09-221-0/+2
|\
| * Merge 10.1 into 10.2Marko Mäkelä2020-09-221-0/+2
| |\
| | * systemd: mariadb@bootstrap - clear ExecStartPre and ExecStartPostDaniel Black2020-09-221-0/+5
| | | | | | | | | | | | | | | | | | | | | | | | This is just to make sure no ExecStartPre/Post actions from the multi-instance MariaDB service definition are executed when a user attempts to start mariadb@bootstrap. Fixes: 3723c70a3045
* | | Merge branch '10.2' into 10.3Oleksandr Byelkin2020-08-032-2/+2
|\ \ \ | |/ /
| * | Merge branch '10.1' into 10.2Oleksandr Byelkin2020-08-022-2/+2
| |\ \ | | |/
| | * MDEV-23088: Change LimitNOFILE default from 16364 to 16384Daniel Black2020-07-282-2/+2
| | | | | | | | | | | | | | | | | | | | | Correct to a true 2^14 rather than some different number that was actually just a number typo. Bug report thanks to Hartmut Holzgraefe.
* | | Merge 10.2 into 10.3Marko Mäkelä2020-06-061-1/+1
|\ \ \ | |/ /
| * | Merge 10.1 into 10.2Julius Goryavsky2020-06-051-1/+1
| |\ \ | | |/
| | * Fix duplicate wordBernard Spil2020-06-021-1/+1
| | | | | | | | | | | | | | | both both -> both Closes #1560
* | | Merge 10.2 into 10.3Marko Mäkelä2020-04-153-4/+4
|\ \ \ | |/ /
| * | Merge 10.1 into 10.2Marko Mäkelä2020-04-143-4/+4
| |\ \ | | |/
| | * Merge 5.5 into 10.1Marko Mäkelä2020-04-141-1/+1
| | |\
| | | * my.cnf: mention that config files must be *.cnfHannu Hartikainen2020-04-031-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | It took me a long time to debug why my configs were not being loaded, and judging from online discussions I'm not the only one. Make the comment in the default my.cnf a bit more helpful. The !includedir directive is implemented in mysys/my_default.c. - f_extensions[] is a list of file extensions. It includes .ini and .cnf on Windows, and only .cnf on all other platforms. - search_default_file_with_ext() contains the !includedir directive. It filters files in the directory to those matching f_extensions[]. This file should only be applicable on Unix-like platforms, so only files with the .cnf extension are read. Closes #1485
| | * | MDEV-20676: systemd script not workingJulius Goryavsky2020-04-082-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When trying to start mariadb via systemctl, WSREP failed to start mysqld for wsrep recovery, because the binary "galera-recovery" is neither searching the mysqld in the same folder as the binary itself nor in the path variable but instead expects the root to be /usr/local/mysql. This fix changes the current directory to the desired directory before starting mysqld.
* | | | Merge branch '10.2' into 10.3Oleksandr Byelkin2020-03-064-4/+4
|\ \ \ \ | |/ / /
| * | | MDEV-19208 mariadb.pc: install into libdirVicențiu Ciorbaru2020-03-051-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | The .pc file installed by mariadb mentions archful directories and therefore must be archful itself. This fixes MDEV-14340.
| * | | Merge branch '10.1' into 10.2Vicențiu Ciorbaru2020-03-053-3/+3
| |\ \ \ | | |/ /
| | * | mariadb.pc: remove unnecessary include directoryBen Boeckel2020-02-261-1/+1
| | | | | | | | | | | | | | | | | | | | When installing, no headers are installed into the parent directory of `${includedir}`.
| | * | mariadb{,@}.service comment typo open-file-limit -> open-files-limitDaniel Black2020-02-252-2/+2
| | | |
* | | | Merge 10.2 into 10.3Marko Mäkelä2020-01-311-15/+20
|\ \ \ \ | |/ / /
| * | | Merge 10.1 into 10.2Marko Mäkelä2020-01-311-15/+20
| |\ \ \ | | |/ /
| | * | MDEV-15052: Allow sysusers and tmpfiles install for non-systemd usersRafli Akmal2020-01-241-17/+20
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ..as they have their own tools that parses those files, such as opensysusers[1] that handles sysusers file and opentmpfiles[2] that handles tmpfiles.d settings Because of this. Move both sysusers and tmpfiles 'if' function outside systemd function, allowing independent install Signed-off-by: Rafli Akmal <thefallenrat@artixlinux.org> [1] - https://github.com/artix-linux/opensysusers [2] - https://github.com/OpenRC/opentmpfiles Changes done by vicentiu@mariadb.org, from original author patch: Installing sysusers and tmpfiles without checking for systemd existence means that by default, cmake will ALWAYS install these files. Our general policy is we do not install things which are not needed. However, there is a valid use case when these files are useful, as is described above. To allow this, provide an extra switch that can be enabled during configuring by doing -DINSTALL_SYSTEMD_{SYSUSERS|TMPFILES}=True This will use the default path INSTALL_SYSTEMD_{SYSUSERS|TMPFILES}DIR fetched from install_layout.cmake for rpm & deb based layouts respectively, or they must be overriden if the install_layout is standalone. Example: cmake . -DINSTALL_SYSTEMD_SYSUSERS=True -DINSTALL_SYSTEMD_SYSUSERSDIR=/etc/sysusers.d
| | * | MDEV-17028: Use descriptive file names for sysusers and tmpfiles configurationChristian Hesse2020-01-241-2/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | These files were installed to: ${INSTALL_SYSTEMD_SYSUSERSDIR}/sysusers.conf ${INSTALL_SYSTEMD_TMPFILESDIR}/tmpfiles.conf Instead rename the files to more descriptive file names 'mariadb.conf'.
* | | | Merge 10.2 into 10.3Marko Mäkelä2019-12-272-0/+14
|\ \ \ \ | |/ / /
| * | | Merge 10.1 into 10.2Marko Mäkelä2019-12-232-0/+14
| |\ \ \ | | |/ /
| | * | MDEV-17571 Make systemd timeout behavior more compatible with long Galera SSTsAxel Schwenke2019-12-052-0/+14
| | | | | | | | | | | | | | | | | | | | Set an explicit start and stop timeout of 900 seconds for the MariaDB Server systemd service
| | * | systemd: mariadb@bootstrap doesn't bootstrap, galera_new_cluster doesDaniel Black2019-11-141-1/+1
| | | | | | | | | | | | | | | | Closes #1106
* | | | Merge 10.2 into 10.3Marko Mäkelä2019-11-061-1/+2
|\ \ \ \ | |/ / /
| * | | Merge 10.1 to 10.2Marko Mäkelä2019-11-061-1/+2
| |\ \ \ | | |/ /
| | * | Fix ninja buildVladislav Vaintroub2019-11-051-1/+2
| | | | | | | | | | | | | | | | | | | | Do not rely on existence of CMakeFiles/${target}.dir directory existence It is not there for custom targets in Ninja build.
* | | | Merge branch '10.2' into 10.3Oleksandr Byelkin2019-10-311-1/+2
|\ \ \ \ | |/ / /
| * | | Merge branch '10.1' into 10.2Oleksandr Byelkin2019-10-301-1/+2
| |\ \ \ | | |/ /
| | * | MDEV-19432 Systemd service does not get re-enabled after upgradeSergei Golubchik2019-10-301-1/+2
| | | | | | | | | | | | | | | | | | | | following Fedora recommendations (see %systemd_post macro in FC29) let's do `systemctl preset` on the first installation of the server
* | | | Merge remote-tracking branch 'origin/10.2' into 10.3Alexander Barkov2019-10-011-1/+1
|\ \ \ \ | |/ / /
| * | | Merge remote-tracking branch 'origin/10.1' into 10.2Alexander Barkov2019-10-011-1/+1
| |\ \ \ | | |/ /
| | * | chkconfig in RPM server scriptletsSergei Golubchik2019-09-271-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | chkconfig --add and --del [might] invoke /sbin/insserv and even if chkconfig exists, insserv might not (SLES15). Ignore chkconfig --del errors - it's a "best effort" cleanup anyway
* | | | Merge remote-tracking branch 'origin/10.2' into 10.3Alexander Barkov2019-09-241-5/+5
|\ \ \ \ | |/ / /
| * | | Merge remote-tracking branch 'origin/10.1' into 10.2Alexander Barkov2019-09-241-5/+5
| |\ \ \ | | |/ /
| | * | Merge remote-tracking branch 'origin/5.5' into 10.1Alexander Barkov2019-09-241-5/+5
| | |\ \ | | | |/
| | | * MDEV-4968 Old advices in mysql-log-rotate scriptchriscalender2019-09-211-5/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | * Change the comments in mysql-log-rotate.sh to refer to mysqld, not mysqld_safe as that's what most distros are using. * Change err-log to log-error as err-log is no longer valid. * Convert tab to space for consistency.
* | | | Remove --basedir arg from systemd startup scriptsVicențiu Ciorbaru2019-09-242-7/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The arg was introduced as part of 75bcf1f9ad4a4bb5fa9cb8818abe6ace52e53d85 to fix a SELinux problem caused by mysqld_safe accessing files it should not be via the my_which function. The root cause for this was fixed in 10.3, via 355ee6877beccf27bcd07d845c985fc1a2845aca which eliminated the my_which function from mysqld_safe entirely. Thus, in 10.3, this --basedir flag is not necessary.
* | | | Merge 10.2 into 10.3Marko Mäkelä2019-09-233-22/+48
|\ \ \ \ | |/ / /
| * | | Merge 10.1 into 10.2Marko Mäkelä2019-09-231-1/+1
| |\ \ \ | | |/ /
| | * | MDEV-19207 systemd service: add instance name in descriptionChristian Hesse2019-09-211-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The unit files made systemd print: systemd[1]: Started MariaDB 10.3.13 database server (multi-instance). Let's add the instance name, so starting mariadb@foo.service makes it print: systemd[1]: Started MariaDB 10.3.13 database server (multi-instance foo).
| * | | MDEV-12646: systemd service file changes from FedoraDaniel Black2019-09-203-23/+47
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Include comment header that describes overrides. Unit description now includes @VERSION@. After=syslog.target removed - redunant Add --basedir=@prefix to prevent /root/.my.cnf lookups. This is placed after $MYSQLD_OPTIONS in case a user sets a --{no,}default type options which has to be first in the mysqld arguements. Additional changes to multi instance (support-files/mariadb@.service.in): * added @SYSTEMD_EXECSTARTPRE@ / @SYSTEMD_EXECSTARTPOST@ * removed mariadb@bootstrap reference as galera_new_cluster as it's a little too proment. * use_galera_new_cluster.conf updated to override pre/post steps to ensure it has no side effects Signed-off-by: Daniel Black <daniel@linux.vnet.ibm.com>
* | | | Merge branch '10.2' into 10.3Oleksandr Byelkin2019-07-261-1/+1
|\ \ \ \ | |/ / /
| * | | Merge branch '10.1' into 10.2Oleksandr Byelkin2019-07-261-1/+1
| |\ \ \ | | |/ /
| | * | Merge branch '5.5' into 10.1Oleksandr Byelkin2019-07-251-1/+1
| | |\ \ | | | |/
| | | * use -f with pgrepMostafa Hussein2019-07-081-1/+1
| | | | | | | | | | | | | | | | pgrep will not be able to get th pid using the full path which is $libexec/mysqld unless -f is being used
* | | | Merge 10.2 into 10.3Marko Mäkelä2019-07-221-2/+3
|\ \ \ \ | |/ / /