summaryrefslogtreecommitdiff
path: root/debian
Commit message (Collapse)AuthorAgeFilesLines
* Merge 10.3 into 10.4Marko Mäkelä2023-01-033-4/+4
|\
| * debian typosmusvaage2022-12-163-4/+4
| |
* | Merge 10.3 into 10.4Marko Mäkelä2022-10-251-1/+1
|\ \ | |/
| * disable LTO in debian buildsSergei Golubchik2022-10-221-1/+1
| |
* | Merge 10.3 into 10.4Marko Mäkelä2022-09-134-4/+4
|\ \ | |/
| * MDEV-28605: Change wrong plugin config installation location (#2160)Tuukka Pasanen2022-09-074-4/+4
| | | | | | | | | | | | | | | | | | | | | | | | Preset include directory for configuration files below MariaDB 10.5 is /etc/mysql/conf.d Change installation location wrong plugin installation location from /etc/mysql/mariadb.d to default include directory /etc/mysql/conf.d. Change makes gssapi-server, oqgraph, rocksdb and tokudb plugins loading work after installation NOTE TO MERGERS: This commit should be upstream to MariaDB 10.4 only! Merging to MariaDB 10.5 and above leads to major problems.
* | Merge 10.3 into 10.4Marko Mäkelä2022-06-272-5/+14
|\ \ | |/
| * MDEV-28628: Change current Debian package revision schemeTuukka Pasanen2022-06-141-4/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Current Debian package revision scheme when using debian/autobake-deb.sh script is: '1:VERSION+maria~LSBNAME' For example if VERSION can be like 10.6.8 and LSBNAME is buster then version and revision is: '1:10.6.8+maria~buster' Which can lead to problem as distro code names can be lexical unordered. For example Debian LSBNAME's can be: Codename Buster is Debian version 10 Codename Bookworm is Debian version 11 This happens because in ASCII table Buster first two digits are 'Bu' and they are in hex 0x42 and 0x75 and Bookworm first digits 'Bo' are they are in hex 0x42 and 0x6F When apt is upgrading it means that: 1:10.6.8+maria~buster is bigger than 1:10.6.8+maria~bookworm and that leads to problems in dist-upgrade process To solve problem revision format is changed to: '1:VERSION+maria~(deb|ubu)LSBVERSION' Example for Debian 11 is now: 1:10.6.8+maria~deb11 and for Ubuntu 22.04 is now: 1:10.6.8+maria~ubu2204 There are new Variables * VERSION which contains whole version string * LSBVERSION which contains LSB version of distro * LSBID which contains LSB ID (Debian or Ubuntu) added to debian/autobake-deb.sh. Also CODENAME is change to LSBNAME as it's more declaritive
| * MDEV-28666: Add correct 'Breaks' to make sure upgrade from 10.2 succeedsTuukka Pasanen2022-06-101-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | File '/usr/bin/mariadb_config' has been moved from Debian package libmariadbd-dev to libmariadb-dev since MariaDB version 10.2 this leads to situation where upgrade will no succeed but fail with this kind of error message * trying to overwrite '/usr/bin/mariadb_config', which is also in package libmariadbd-dev 1:10.2.44+maria~bionic Add libmariadbd-dev to libmariadb-dev Debian control files 'Breaks' solve situation and upgrading won't error anymore
* | Merge branch '10.3' into 10.4Sergei Golubchik2022-05-083-3/+10
|\ \ | |/
| * Merge branch '10.2' into 10.3Sergei Golubchik2022-05-072-3/+9
| |\
| | * Use proper pid namespaceanel2022-05-042-3/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Problem: ============== By testing `pgrep` with `--ns` option, introduced with MDEV-21331, commit fb7c1b9415c9a8b0dc2e86ae44f0e7a2634e5d7e, I noted that: a) `--ns` cannot use more than single PID. b) `--ns` is returning the processes of the namespace to which supplied PID belongs to. So by that sense command `pgrep -x --ns $$ mysqld` will always return an error and skip checking of the existing PID of the server. Solution: ============== Suggested solution is to add `--nslist pid`, since `--ns` needs to know in which namespace type it should look for. See `pgrep --help` for different namespace types. Note also that this works *only* if script is run as a `root` (we have that case here). Current PR is a part of: 1. MDEV-21331: sync preinst and postrm script 2. MDEV-15718: check for exact mysqld process This commit: a) fixes fb7c1b9415c9a8b0dc2e86ae44f0e7a2634e5d7e b) Closes PR #2068 (obsolete) c) Closes PR #2069 (obsolete) Thanks Faustin Lammler <faustin@mariadb.org> for testing and verifying Reviewed by <>
| * | MDEV-12275: Add switch '--silent' to SySV init upgradeTuukka Pasanen2022-05-051-1/+1
| | | | | | | | | | | | | | | | | | Debian script debian-start upgrades database (which can be huge) and prints lots of unnecessary information (not errors). Add '--silent' to only sport possible errors
* | | MDEV-28227 Chinese translation postfixDaniel Black2022-04-261-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add chinese language to missing sql/share/CMakeLists.txt that results in installed files. Also add bulgarian=bgn which has existing for a long time. Sort both lists properly. Append both to debian/mariadb-server-core-10.4 too.
* | | Merge 10.3 to 10.4Daniel Black2022-03-162-114/+16
|\ \ \ | |/ / | | | | | | | | | | | | | | | | | | extra2_read_len resolved by keeping the implementation in sql/table.cc by exposed it for use by ha_partition.cc Remove identical implementation in unireg.h (ref: bfed2c7d57a7ca34936d6ef0688af7357592dc40)
| * | Merge 10.2 (part) into 10.3Daniel Black2022-03-152-114/+16
| |\ \ | | |/ | | | | | | | | | | | | | | | commit '6de482a6fefac0c21daf33ed465644151cdf879f' 10.3 no longer errors in truncate_notembedded.test but per comments, a non-crash is all that we are after.
| | * MDEV-28011: debian autobake cleanupDaniel Black2022-03-102-102/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Travis is dead to us so we don't need all the conditions around it. Remove depends for no longer supported versions Debian Jessies, and Ubuntu Trusty, Xenial, Wily are all eol as far as we are concerned. The dependancy on an apt cache when running autobake broke the 10.2 aarch64 packages (MDEV-28014). Lets reduce the risk here.
| | * Remove --upgrade-info option from mysql_upgradeMonty2022-01-271-1/+1
| | | | | | | | | | | | | | | | | | Removed the option as it safe to always create the file when we have created the MariaDB data directories. This fixes this issue not only for debian but for all MariaDB users.
| | * MDEV-27607: mysql_install_db to install mysql_upgrade_infoDaniel Black2022-01-271-1/+1
| | | | | | | | | | | | | | | | | | | | | For compatibility this is under an extra option --upgrade-info The goal here is to install a data directory with the required info to let mysql_upgrade know that an upgrade isn't required.
* | | Merge 10.3 into 10.4Marko Mäkelä2022-03-111-8/+8
|\ \ \ | |/ /
| * | MDEV-28022: Debian stretch has zstd too oldDaniel Black2022-03-101-8/+8
| | | | | | | | | | | | | | | | | | | | | zstd-1.1.3 is needed however stretch has only 1.1.2. Move to distro version based checks as checks against the apt-cache are unreliable if there is no cache.
* | | Use mysqladmin ping instead of pid filesChristopher Odenbach2021-12-031-2/+2
| | | | | | | | | How 'bout know?
* | | Fix logrotate problem with twice configured pid-file optionChristopher Odenbach2021-12-031-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Hi, if the pid-file option is configured more than once (e.g. multiple times in different files), my_print_defaults prints it twice, resulting in the logrotate postrotate script failing because of a syntax error. Debian fixed this already (https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=830976#42). Perhaps you could implement this small change in the other branches as well? Thanks, Christopher
* | | Merge 10.3 into 10.4Marko Mäkelä2021-08-231-5/+2
|\ \ \ | |/ /
| * | Merge 10.2 into 10.3Marko Mäkelä2021-08-231-6/+2
| |\ \ | | |/
| | * Unused flag creates cleaning issue (piuparts)Faustin Lammler2021-08-201-6/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The "$mysql_statedir/debian-$MAJOR_VER.flag" is not used by any maintainer script ("$mysql_datadir/debian-$MAJOR_VER.flag" is used, https://github.com/MariaDB/server/blob/10.6/debian/mariadb-server-10.6.postinst#L164). See: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=985870 Fix also some minor typo.
* | | Merge branch '10.3' into 10.4Oleksandr Byelkin2021-07-311-2/+2
|\ \ \ | |/ /
| * | Merge branch '10.2' into 10.3Sergei Golubchik2021-07-211-2/+2
| |\ \ | | |/
| | * Update description of mariadb-common packageAnel Husakovic2021-07-091-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Commit https://github.com/mariadb/server/commit/438ed0408c69 introduced `mariadb-common` package and added description. Example in description is confusing since files referred to are not installed and not related/owned by the `mariadb-common` package. - Patch is updating real file/directory description section pointing to the real examples owned by the package. - Example: ``` mariadb-client-10.3 install mariadb-client-core-10.3 install mariadb-common install mariadb-server install mariadb-server-10.3 install mariadb-server-core-10.3 install /. /etc /etc/mysql /etc/mysql/mariadb.cnf /etc/mysql/mariadb.conf.d /usr /usr/share /usr/share/doc /usr/share/doc/mariadb-common /usr/share/doc/mariadb-common/changelog.Debian.gz /usr/share/doc/mariadb-common/copyright ``` Closes PR #1690 Reviewed by: otto@kekalainen.net
* | | Merge 10.3 into 10.4Marko Mäkelä2021-06-081-4/+0
|\ \ \ | |/ /
| * | Merge 10.2 into 10.3Marko Mäkelä2021-06-081-4/+0
| |\ \ | | |/
| | * Revert "CONNECT: move jar files to /usr/share and include them in DEBs"Otto Kekäläinen2021-06-061-4/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This partially reverts commit d7321893d8c50071632a102e17a7869da9cb03a5. The *.jar files are not being built and all Debian builds are failing as dh_install stops on missing files. To build them we would need to also add new Java build dependencies. In a stable release (10.2->10.5) we shouldn't add new files and certainly not any new build dependencies, so reverting commit. Also, the files are located in a different path, and already included in the mariadb-test-data package: /usr/share/mysql/mysql-test/plugin/connect/connect/std_data/JavaWrappers.jar /usr/share/mysql/mysql-test/plugin/connect/connect/std_data/JdbcMariaDB.jar /usr/share/mysql/mysql-test/plugin/connect/connect/std_data/Mongo2.jar /usr/share/mysql/mysql-test/plugin/connect/connect/std_data/Mongo3.jar This change needs to be redesigned and applies only on 10.6 or newer.
* | | Merge 10.3 into 10.4Marko Mäkelä2021-05-251-0/+4
|\ \ \ | |/ /
| * | Merge 10.2 into 10.3Marko Mäkelä2021-05-241-0/+4
| |\ \ | | |/
| | * CONNECT: move jar files to /usr/share and include them in DEBsSergei Golubchik2021-05-221-0/+4
| | |
* | | Merge 10.3 into 10.4Marko Mäkelä2021-04-143-3/+12
|\ \ \ | |/ /
| * | Merge 10.2 into 10.3Marko Mäkelä2021-04-132-1/+10
| |\ \ | | |/
| | * Deb: Stop depending on empty transitional package dh-systemdOtto Kekäläinen2021-04-122-1/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | MariaDB Server still supports Ubuntu 16.04 "Xenial" until it goes EOL in April 30, 2021. Thus we need to include a customization for backwards compatibility. This change is intended to be applied for all MariaDB versions still supported, i.e. 10.2 to 10.6.
| * | Merge 10.2 into 10.3Marko Mäkelä2021-04-091-2/+2
| |\ \ | | |/
| | * Fix postinst trigger when systemd is not running (Closes: #983563)bb-10.2-anel-systemdpatchArnaud Rebillout2021-04-061-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Checking for the existence of the systemctl command only tells us that systemd is installed, however it does not tell us if systemd is running. What we really want to do here is reload systemd if it's installed AND if it's running. The usual way to check if systemd is running is to check for the existence of '/run/systemd/system'. Why would systemd be installed but not running? This is something that happens when one sets up or upgrade a system in a chroot or container. For more details refer to the bug report: <https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=983563> Closes PR #1787
* | | Merge branch '10.3' into 10.4Daniel Black2021-02-251-0/+1
|\ \ \ | |/ /
| * | Merge remote-tracking branch 'origin/10.2' into 10.3Daniel Black2021-02-251-0/+1
| |\ \ | | |/
| | * MDEV-24728: Debian include client caching_sha2_password pluginDaniel Black2021-02-251-0/+2
| | | | | | | | | | | | | | | | | | | | | Backport of 4bc31a904f22 Include client libraries for auth caching_sha2_password and sha256_password in the libmariadb3 client library package.
| | * Skip TokuDB within autobake-deb.shVicențiu Ciorbaru2021-01-292-5/+6
| | | | | | | | | | | | | | | | | | Skipping the package within debian/rules won't work because starting with Debian 10, the helper scripts read the control file before the recipe.
* | | Merge branch 'bb-10.3-release' into bb-10.4-releaseSergei Golubchik2021-02-121-0/+6
|\ \ \ | |/ / | | | | | | | | | Note, the fix for "MDEV-23328 Server hang due to Galera lock conflict resolution" was null-merged. 10.4 version of the fix is coming up separately
| * | Merge branch '10.2' into 10.3Sergei Golubchik2021-02-011-0/+6
| |\ \
| | * | Skip TokuDB within autobake-deb.shVicențiu Ciorbaru2021-01-292-5/+6
| | |/ | | | | | | | | | | | | | | | Skipping the package within debian/rules won't work because starting with Debian 10, the helper scripts read the control file before the recipe.
| | * travis: 10.2 only - make fasterDaniel Black2020-10-061-0/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove from debian build: * tokudb * mroonga * spider * ograph * embedded server Add ccache to debian build. Backport 10.3 changes to autobake-deb that make travis faster. Merge instructions: Drop this commit on merge to 10.3
* | | Merge branch '10.3' into 10.4Sujatha2020-09-282-2/+2
|\ \ \ | |/ /
| * | Merge branch '10.2' into 10.3Sujatha2020-09-282-2/+2
| |\ \ | | |/
View Lorry Controller Status