summaryrefslogtreecommitdiff
path: root/debian
Commit message (Collapse)AuthorAgeFilesLines
* Merge 10.2 into 10.3Marko Mäkelä2020-07-021-1/+1
|\
| * Merge 10.1 into 10.2bb-10.2-mergeMarko Mäkelä2020-07-011-1/+1
| |\
| | * mtr: use env for perlDaniel Black2020-06-231-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | On FreeBSD, perl isn't in /usr/bin, its in /usr/local/bin or elsewhere in the path. Like storage/{maria/unittest/,}ma_test_* , we use /usr/bin/env to find perl and run it.
| | * cracklib-runtime needs a comma after to parse properlyVicențiu Ciorbaru2019-11-261-1/+1
| | |
| | * MDEV-13288: Proper fix for cracklib-runtimeVicențiu Ciorbaru2019-11-262-2/+1
| | | | | | | | | | | | | | | The required dependencies should be added through the autobake script, to also cover distributions that do not support libcrack2.
| | * MDEV-13288: Upstream debian patchVicențiu Ciorbaru2019-11-261-0/+1
| | |
| * | Travis-CI: Shorten deb build log to keep it under 4 MBOtto Kekäläinen2020-05-171-2/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | There is a 4 MB hard limit on Travis-CI and build output needs to be less than that. Silencing the 'make install' step gets rid of a lot of "Installing.." and "Missing.." and removing all mysql-test files will make the dh_missing warnings much shorter. Cherry-picked from 41952c85f1644690249ce624de7609cbebb93638.
* | | Merge 10.2 into 10.3Marko Mäkelä2020-04-281-1/+1
|\ \ \ | |/ /
| * | MDEV-21331 installation fails on a server with containersSergei Golubchik2020-04-281-1/+1
| | | | | | | | | | | | | | | when detecting running mysqld processes to stop, ignore processes in different namespaces.
* | | Travis-CI: Shorten deb build log to keep it under 4 MBOtto Kekäläinen2020-04-051-2/+7
| | | | | | | | | | | | | | | | | | | | | There is a 4 MB hard limit on Travis-CI and build output needs to be less than that. Silencing the 'make install' step gets rid of a lot of "Installing.." and "Missing.." and removing all mysql-test files will make the dh_missing warnings much shorter.
* | | Change exec bit to allow dh-exec to workVicențiu Ciorbaru2020-03-181-0/+0
| | |
* | | Correctly link mysqlclient.pc to mariadb.pc under multi-arch supportVicențiu Ciorbaru2020-03-082-1/+3
| | |
* | | Merge branch '10.2' into 10.3Vicențiu Ciorbaru2020-03-081-3/+0
|\ \ \ | |/ /
| * | Update install layout to account for multi-arch setupDaniel Black2020-03-081-3/+0
| | | | | | | | | | | | | | | | | | | | | Cleanup install_layout to account for multi-arch setup and remove redundant defines in debian rules. Signed-off-by: Vicențiu Ciorbaru <vicentiu@mariadb.org>
* | | Merge branch '10.2' into 10.3Oleksandr Byelkin2020-03-061-1/+1
|\ \ \ | |/ /
| * | 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.
* | | Deb: Run 'wrap-and-sort -a' so comparison across releases is easierOtto Kekäläinen2020-02-136-10/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | No functional changes. Apply this in 10.3 so eventually it is merged to 10.4 and 10.5, which in turn will have separate wrap-and-sort runs but only for new lines, and not affecting badly next merges from 10.3 to 10.4 to 10.5. Also remove a duplicate line that was found thanks to wrap-and-sort.
* | | Deb: Remove unnecessary manual libzstd1 dependency from RocksDB pluginOtto Kekäläinen2020-02-132-2/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The Debian build tools add all run-time dependencies automatically. For the mariadb-rocksdb-plugin the "${misc:Depends}, ${shlibs:Depends}" will become (based on the build dependencies at build time): Depends: mariadb-server-10.4 (= 1:10.4.12-1), rocksdb-tools, libc6 (>= 2.29), liblz4-1 (>= 0.0~r130), libsnappy1v5 (>= 1.1.8), libstdc++6 (>= 7), libzstd1 (>= 1.3.3), zlib1g (>= 1:1.1.4) There is no need to manually add run-time build dependencies. Only external dependencies need to be defined, for example rocksdb-tools could come in question for mariadb-plugin-rocksdb, and it will be eventually added when downstream official Debian packaging is merged upstream in a later commit.
* | | Merge branch '10.2' into 10.3Oleksandr Byelkin2020-01-241-0/+2
|\ \ \ | |/ /
| * | MDEV-17292 Package the pam_user_map moduleSergei Golubchik2020-01-211-0/+2
| | |
* | | Lintian complains on spelling errorFaustin Lammler2019-12-021-1/+1
| | | | | | | | | | | | | | | The lintian check complains on spelling error: https://salsa.debian.org/mariadb-team/mariadb-10.3/-/jobs/95739
* | | Revert "Fix upgrade errors on eoan"Sergei Golubchik2019-11-291-10/+0
| | | | | | | | | | | | | | | | | | | | | This reverts commit 0d345ec2e358ec8f42865be9a17e6f007585931d. Upgrades from 8.0 don't work yet, one has to dump/restore manually to get the metadata out of the data dictionary.
* | | Fix upgrade errors on eoanSergei Golubchik2019-11-281-0/+10
| | | | | | | | | | | | mariadb packages conflict with mysql-8.0
* | | Merge 10.2 into 10.3Marko Mäkelä2019-11-141-1/+1
|\ \ \ | |/ /
| * | Fix a typo in mariadb-plugin-mroonga.prermYasuhiro Horimoto2019-11-121-1/+1
| | | | | | | | | | | | Closes #1407
* | | Merge branch '10.2' into 10.3Oleksandr Byelkin2019-10-311-2/+0
|\ \ \ | |/ /
| * | Merge branch '10.1' into 10.2Oleksandr Byelkin2019-10-301-2/+0
| |\ \ | | |/
| | * Remove bogus adviceMarko Mäkelä2019-10-281-2/+0
| | | | | | | | | | | | | | | | | | Ever since MariaDB 10.0 (and MySQL 5.6.8), the innodb_log_file_size and innodb_log_files_in_group can be changed between server restarts, and the redo log files will be resized on server startup if needed.
* | | Merge 10.2 into 10.3Marko Mäkelä2019-09-231-5/+5
|\ \ \ | |/ /
| * | Merge 10.1 into 10.2Marko Mäkelä2019-09-231-5/+5
| |\ \ | | |/
| | * Deb: Implement proper version detection in maintainer scriptsOtto Kekäläinen2019-09-181-6/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes bug introduced in commit 5415002. Using script run-time filename does not always work. One cannot assume that the filename is always the same as there might be temporary file names used by dpkg in certain situations. See Debian #920415. The same fix has been successfully in use in Debian official packages since February 2019: https://salsa.debian.org/mariadb-team/mariadb-10.3/commit/6440c0d6e75
| * | Updated mtr files to support different compiled in optionsMonty2019-09-011-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This allows one to run the test suite even if any of the following options are changed: - character-set-server - collation-server - join-cache-level - log-basename - max-allowed-packet - optimizer-switch - query-cache-size and query-cache-type - skip-name-resolve - table-definition-cache - table-open-cache - Some innodb options etc Changes: - Don't print out the value of system variables as one can't depend on them to being constants. - Don't set global variables to 'default' as the default may not be the same as the test was started with if there was an additional option file. Instead save original value and reset it at end of test. - Test that depends on the latin1 character set should include default_charset.inc or set the character set to latin1 - Test that depends on the original optimizer switch, should include default_optimizer_switch.inc - Test that depends on the value of a specific system variable should set it in the test (like optimizer_use_condition_selectivity) - Split subselect3.test into subselect3.test and subselect3.inc to make it easier to set and reset system variables. - Added .opt files for test that required specfic options that could be changed by external configuration files. - Fixed result files in rockdsb & tokudb that had not been updated for a while.
* | | Correct the merge 0f83c8878dc1389212c134f65d37a43d9d248250Marko Mäkelä2019-09-101-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | Re-enable some Galera tests that should have been enabled. Add client_ed25519.so to debian/libmariadb3.install; merge e47a143fc08f7114fd877ad8ee83d322f877a672 correctly. Remove a duplicated #include from wsrep_mysqld.cc.
* | | Merge 10.2 into 10.3Eugene Kosov2019-07-161-1/+1
|\ \ \ | |/ /
| * | package ed25519 in debsSergei Golubchik2019-07-102-0/+2
| | | | | | | | | | | | partial backport from 10.3
| * | MDEV-19942 Default installation of mariadb-server doesn't allow clients to ↵Sergei Golubchik2019-07-051-1/+1
| | | | | | | | | | | | | | | | | | | | | use client plugins while client tools technically don't need or depend on libmariadb3.so, they need client plugins, that come with it.
* | | Merge 10.2 into 10.3Marko Mäkelä2019-05-296-12/+12
|\ \ \ | |/ /
| * | Merge 10.1 into 10.2Marko Mäkelä2019-05-286-12/+12
| |\ \ | | |/
| | * Mention the sample IPv4 address 10.0.0.1Marko Mäkelä2019-05-286-12/+12
| | |
* | | Merge 10.2 into 10.3Marko Mäkelä2019-05-143-5/+5
|\ \ \ | |/ /
| * | Merge 10.1 into 10.2Marko Mäkelä2019-05-133-5/+5
| |\ \ | | |/
| | * Merge branch '5.5' into 10.1Vicențiu Ciorbaru2019-05-111-1/+1
| | |\
| | | * Update FSF AddressVicențiu Ciorbaru2019-05-111-1/+1
| | | | | | | | | | | | | | | | * Update wrong zip-code
| | * | Merge branch '5.5' into 10.1Vicențiu Ciorbaru2019-05-114-6/+6
| | |\ \ | | | |/
| | | * Follow-up to changing FSF addressVicențiu Ciorbaru2019-05-112-4/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Some places didn't match the previous rules, making the Floor address wrong. Additional sed rules: sed -i -e 's/Place.*Suite .*, Boston/Street, Fifth Floor, Boston/g' sed -i -e 's/Suite .*, Boston/Fifth Floor, Boston/g'
| | | * Update FSF addressMichal Schorm2019-05-104-10/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This commit is based on the work of Michal Schorm, rebased on the earliest MariaDB version. Th command line used to generate this diff was: find ./ -type f \ -exec sed -i -e 's/Foundation, Inc., 59 Temple Place, Suite 330, Boston, /Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, /g' {} \; \ -exec sed -i -e 's/Foundation, Inc. 59 Temple Place.* Suite 330, Boston, /Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, /g' {} \; \ -exec sed -i -e 's/MA.*.....-1307.*USA/MA 02110-1335 USA/g' {} \; \ -exec sed -i -e 's/Foundation, Inc., 59 Temple/Foundation, Inc., 51 Franklin/g' {} \; \ -exec sed -i -e 's/Place, Suite 330, Boston, MA.*02111-1307.*USA/Street, Fifth Floor, Boston, MA 02110-1335 USA/g' {} \; \ -exec sed -i -e 's/MA.*.....-1307/MA 02110-1335/g' {} \;
| * | | Merge branch '10.1' into 10.2Oleksandr Byelkin2019-05-042-12/+12
| |\ \ \ | | |/ /
| | * | MDEV-17640 UMASK_DIR configuration for mysql_install_db is not applied to ↵Sergei Golubchik2019-04-241-11/+10
| | | | | | | | | | | | | | | | | | | | | | | | mysql database create mysql and test databases with SQL, not mkdir.
| | * | MDEV-18362 EPOCH=1 needs to be set for Ubuntu 18.10 cosmic buildsSergei Golubchik2019-04-241-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Apply dbart's patch to set epoch for all ubuntu releases starting from bionic. Not only for bionic. This works for Debian too (VERNUM=unstable, etc).
* | | | Merge 10.2 into 10.3Marko Mäkelä2019-03-041-9/+12
|\ \ \ \ | |/ / /