summaryrefslogtreecommitdiff
path: root/support-files
Commit message (Collapse)AuthorAgeFilesLines
* Merge 10.2 into 10.3Marko Mäkelä2018-11-061-12/+19
|\ | | | | | | | | | | | | | | | | main.derived_cond_pushdown: Move all 10.3 tests to the end, trim trailing white space, and add an "End of 10.3 tests" marker. Add --sorted_result to tests where the ordering is not deterministic. main.win_percentile: Add --sorted_result to tests where the ordering is no longer deterministic.
| * Merge 10.1 into 10.2Marko Mäkelä2018-11-061-12/+19
| |\
| | * 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.2' into 10.3Sergei Golubchik2018-09-283-6/+17
|\ \ \ \ \ | |/ / / /
| * | | | MDEV-14560 Extra engines enabled through additional config are not loaded on ↵Sergei Golubchik2018-09-222-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | first installation Use RedHat-recommended /var/lib/rpm-state/mariadb/ for restart flag. This also fixes SUSE where /var/lib/rpm-state doesn't necessarily exist.
| * | | | MDEV-14560 Extra engines enabled through additional config are not loaded on ↵Sergei Golubchik2018-09-213-6/+15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | first installation RPM solution: Make all server plugins to restart the server when installed. To avoid multiple server restarts, do it only once in posttrans scriptlet. Add support for CPACK_RPM_<component>_POST_TRANS_SCRIPT_FILE
| * | | | 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
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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.
* | | | | MDEV-14900 Upstream 10.3 debian patchesSergei Golubchik2018-08-123-4/+17
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | applied (at least partially): * armhf_mroonga_storage_fail.patch (unaligned write) * mysqld_multi.server_lsb-header.patch (add LSB header) * fix-spelling-errors.patch (tabxml.cpp) * hurd_socket.patch (in Platform.pm) * remove-systemd-obsolete-target.patch
* | | | | Merge branch '10.2' into 10.3Sergei Golubchik2018-06-304-3/+5
|\ \ \ \ \ | |/ / / /
| * | | | 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
| | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
* | | | \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge 10.2 into 10.3Marko Mäkelä2018-06-071-3/+5
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / / / /
| * | | | | | | | | | | | | | | | | | 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 ↵Elena Stepanova2018-03-035-11/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | my-innodb-heavy-4G.cnf file
* | | | | | | | | | | | | | | | | | | MDEV-15474 Update server.cnf section to mariadb-10.3Ian Gilfillan2018-03-071-2/+2
| | | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | Merge bb-10.2-ext into 10.3Marko Mäkelä2018-02-153-25/+23
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge remote-tracking branch 'origin/10.2' into bb-10.2-extAlexander Barkov2018-02-083-25/+23
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / / / / / /
| | * | | | | | | | | | | | | | | | | | 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
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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.`
* | | | | | | | | | | | | | | | | | Remove compiler warningsMonty2018-01-301-0/+5
| | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | Merge bb-10.2-ext into 10.3Marko Mäkelä2018-01-043-0/+17
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / / /
| * | | | | | | | | | | | | | | | | Merge remote-tracking branch 'origin/10.2' into bb-10.2-extMonty2018-01-013-0/+17
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: cmake/make_dist.cmake.in mysql-test/r/func_json.result mysql-test/r/ps.result mysql-test/t/func_json.test mysql-test/t/ps.test sql/item_cmpfunc.h
| | * | | | | | | | | | | | | | | | 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
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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.
* | | | | | | | | | | | | | | | | | Merge bb-10.2-ext into 10.3Marko Mäkelä2017-12-192-6/+12
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / / /
View Lorry Controller Status