summaryrefslogtreecommitdiff
path: root/support-files
Commit message (Collapse)AuthorAgeFilesLines
* Merge 10.4 into 10.5Marko Mäkelä2020-09-232-1/+3
|\
| * Merge 10.3 into 10.4Marko Mäkelä2020-09-221-0/+2
| |\
| | * 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
| * | | | MDEV-23589: Portability: use `uname -n` instead of `hostname`Geert Hendrickx2020-09-101-1/+1
| | | | | | | | | | | | | | | | | | | | Closes PR #1663
* | | | | MDEV-18841: /var/run -> /run for apparmor/systemd serviceDaniel Black2020-08-242-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Match 10.5 path changes in: * b2feb030014f5ff7d71cd55326a93cc709386407 * aaaf005ce61a543f1a1470b179ccb535698b36ef * bb8477778b72f047437b2a03a2bd38997e155f10
* | | | | Merge branch '10.4' into 10.5Oleksandr Byelkin2020-08-042-2/+2
|\ \ \ \ \ | |/ / / /
| * | | | Merge branch '10.3' into 10.4Oleksandr Byelkin2020-08-032-2/+2
| |\ \ \ \ | | |/ / /
| | * | | 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.
* | | | | MDEV-22569: Run bin/mariadbd instead of bin/mysqldOtto Kekäläinen2020-06-169-71/+71
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Replace all references to /usr/sbin/mysqld (and bin and libexec) with mariadbd, so that the binary server will always be 'mariadbd'. Also update all places that reference the server binary in other ways, such as AppArmor profiles and scripts that previously expected to find a 'mysqld' in process lists.
* | | | | Merge 10.4 into 10.5Marko Mäkelä2020-06-071-1/+1
|\ \ \ \ \ | |/ / / /
| * | | | Merge 10.3 into 10.4Marko Mäkelä2020-06-061-1/+1
| |\ \ \ \ | | |/ / /
| | * | | 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.4 into 10.5Marko Mäkelä2020-04-252-2/+2
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | The functional changes of commit 5836191c8f0658d5d75484766fdcc3d838b0a5c1 (MDEV-21168) are omitted due to MDEV-742 having addressed the issue.
| * | | | Merge 10.3 into 10.4Marko Mäkelä2020-04-162-2/+2
| |\ \ \ \ | | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | In main.index_merge_myisam we remove the test that was added in commit a2d24def8cc42d27c72d833abfb39ef24a2b96ba because it duplicates the test case that was added in commit 5af12e463549e4bbc2ce6ab720d78937d5e5db4e.
| | * | | 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.
* | | | | | Ship mariadb.service and mysql[d].service symlinksVicențiu Ciorbaru2020-04-201-1/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Create symlinks during configure time and install them. This is necessary as Alias support from systemd service file was dropped with: 6af0bd69074725c8d8b10f07ed4ccc013d010322 * Also ignore the generated symlinks in gitignore
* | | | | | MDEV-15526 systemd unit files naming and installationFaustin Lammler2020-04-181-2/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Drop Aliases from the service file directive. Aliases in the service file only take effect when the service is enabled. This is the case because Aliases in service files do not have to be unique across various services. Shipping symlinks guarantees that one can always enable mariadb service using `systemctl enable mysql` or `systemctl enable mysqld` and makes the commands indempotent.
* | | | | | Merge branch '10.4' into 10.5Oleksandr Byelkin2020-03-114-4/+4
|\ \ \ \ \ \ | |/ / / / /
| * | | | | Merge commit '10.3' into 10.4Oleksandr Byelkin2020-03-114-4/+4
| |\ \ \ \ \ | | |/ / / /
| | * | | | 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 branch '10.4' into 10.5Oleksandr Byelkin2020-02-121-15/+20
|\ \ \ \ \ \ | |/ / / / /
| * | | | | Merge branch '10.3' into 10.4Oleksandr Byelkin2020-02-111-15/+20
| |\ \ \ \ \ | | |/ / / /
| | * | | | 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.4 into 10.5Marko Mäkelä2020-01-201-5/+2
|\ \ \ \ \ \ | |/ / / / /
| * | | | | rpm/deb and auth_pam_tool_dir/auth_pam_toolSergei Golubchik2020-01-171-5/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | don't let mysql_install_db set SUID bit for auth_pam_tool in rpm/deb packages - instead package files with correct permissions and only fix the ownership of auth_pam_tool_dir (which can only be done after mysql user is created, so in post-install). keep old mysql_install_db behavior for bintars
* | | | | | Merge 10.4 into 10.5Marko Mäkelä2019-12-272-0/+14
|\ \ \ \ \ \ | |/ / / / /
| * | | | | Merge 10.3 into 10.4Marko Mäkelä2019-12-272-0/+14
| |\ \ \ \ \ | | |/ / / /
| | * | | | 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.4 into 10.5Marko Mäkelä2019-11-071-1/+2
|\ \ \ \ \ \ | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | A conflict between MDEV-19514 (b42294bc6409794bdbd2051b32fa079d81cea61d) and MDEV-20934 (d7a2401750bb29dfdb45929a536539b9f17b347f) was resolved. We will not invoke the function ibuf_delete_recs() from ibuf_merge_or_delete_for_page(). Instead, we will add that logic to the function ibuf_read_merge_pages().
| * | | | | Merge 10.3 into 10.4Marko Mäkelä2019-11-061-1/+2
| |\ \ \ \ \ | | |/ / / /
View Lorry Controller Status