Skip to content

M
MariaDB
Commit 7a0fa9da authored by Otto Kekäläinen's avatar Otto Kekäläinen Committed by Daniel Black
Browse files
Options

Deb: Cleanup and document 

- Remove unnecessary unused files
- Remove duplicate encryption configuration sample from sources and
  re-use the identical file in RPM directory instead
- Clean away harmful "default-character-set = utf8mb4" from client config
  as it is unnecassary (server enforces utf8mb4 anyway by default) and
  could cause issues with mysqlbinlog and other tools (MDEV-22981).
- Update S3 plugin description to be long enough
- Remove trailing whitespace from support-files and Debian packaging.
- Clean away fixed Lintian issues
- Clean away temporary Salsa-CI fixes now that 10.5.4 is out and is fixed
- Apply wrap-and-sort -a -v
parent 7c1807a0
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 112 additions and 165 deletions
debian/additions/Docs__Images__Makefile.in deleted 100644 → 0
View file @ 7c1807a0
all:
distclean:
-rm -f Makefile
.PHONY: all distclean clean install check
debian/additions/Docs__Makefile.in deleted 100644 → 0
View file @ 7c1807a0
all:
distclean:
-rm -f Makefile
.PHONY: all distclean clean install check
debian/additions/debian-start.inc.sh
View file @ 7a0fa9da
......@@ -5,7 +5,7 @@
## Check MyISAM and Aria unclosed tables.
# - Requires the server to be up.
# - Is supposed to run silently in background.
# - Is supposed to run silently in background.
function check_for_crashed_tables() {
set -e
set -u
......@@ -25,7 +25,7 @@ function check_for_crashed_tables() {
LC_ALL=C $MYSQL --skip-column-names --batch -e '
select concat('\''select count(*) into @discard from `'\'',
TABLE_SCHEMA, '\''`.`'\'', TABLE_NAME, '\''`'\'')
TABLE_SCHEMA, '\''`.`'\'', TABLE_NAME, '\''`'\'')
from information_schema.TABLES where TABLE_SCHEMA<>'\''INFORMATION_SCHEMA'\'' and TABLE_SCHEMA<>'\''PERFORMANCE_SCHEMA'\'' and ( ENGINE='\''MyISAM'\'' or ENGINE='\''Aria'\'' )' | \
xargs -i $MYSQL --skip-column-names --silent --batch \
--force -e "{}" &>$tempfile
......@@ -39,8 +39,8 @@ function check_for_crashed_tables() {
$MYADMIN processlist status
) >> $tempfile
# Check for presence as a dependency on mailx would require an MTA.
if [ -x /usr/bin/mailx ]; then
mailx -e -s"$MYCHECK_SUBJECT" $MYCHECK_RCPT < $tempfile
if [ -x /usr/bin/mailx ]; then
mailx -e -s"$MYCHECK_SUBJECT" $MYCHECK_RCPT < $tempfile
fi
(echo "$MYCHECK_SUBJECT"; cat $tempfile) | logger -p daemon.warn -i -t$0
fi
......@@ -49,7 +49,7 @@ function check_for_crashed_tables() {
## Check for tables needing an upgrade.
# - Requires the server to be up.
# - Is supposed to run silently in background.
# - Is supposed to run silently in background.
function upgrade_system_tables_if_necessary() {
set -e
set -u
......@@ -69,7 +69,7 @@ function upgrade_system_tables_if_necessary() {
function check_root_accounts() {
set -e
set -u
logger -p daemon.info -i -t$0 "Checking for insecure root accounts."
ret=$( echo "SELECT count(*) FROM mysql.user WHERE user='root' and password='' and plugin in ('', 'mysql_native_password', 'mysql_old_password');" | $MYSQL --skip-column-names )
......
debian/additions/enable_encryption.preset deleted 100644 → 0
View file @ 7c1807a0
#
# !include this file into your my.cnf (or any of *.cnf files in /etc/mysql/conf.d)
# and it will enable data at rest encryption. This is a simple way to
# ensure that everything that can be encrypted will be and your
# data will not leak unencrypted.
#
# DO NOT EDIT THIS FILE! On MariaDB upgrades it might be replaced with a
# newer version and your edits will be lost. Instead, add your edits
# to the .cnf file after the !include directive.
#
# NOTE that you also need to install an encryption plugin for the encryption
# to work. See https://mariadb.com/kb/en/mariadb/data-at-rest-encryption/#encryption-key-management
#
[mariadb]
aria-encrypt-tables
encrypt-binlog
encrypt-tmp-disk-tables
encrypt-tmp-files
loose-innodb-encrypt-log
loose-innodb-encrypt-tables
debian/additions/innotop/innotop
View file @ 7a0fa9da
This diff is collapsed.
debian/additions/innotop/innotop.1
View file @ 7a0fa9da
......@@ -193,8 +193,8 @@ After you've connected, innotop should show you something like the following:
.PP
.Vb 1
\& [RO] Query List (? for help) localhost, 01:11:19, 449.44 QPS, 14/7/163 con/run
\&
\& CXN When Load QPS Slow QCacheHit KCacheHit BpsIn BpsOut
\&
\& CXN When Load QPS Slow QCacheHit KCacheHit BpsIn BpsOut
\& localhost Total 0.00 1.07k 697 0.00% 98.17% 476.83k 242.83k
\&
\& CXN Cmd ID User Host DB Time Query
......@@ -324,7 +324,7 @@ This mode is similar to mytop's Command Summary mode. It shows the
.Vb 8
\& Command Summary (? for help) localhost, 25+07:16:43, 2.45 QPS, 3 thd, 5.0.40
\& _\|_\|_\|_\|_\|_\|_\|_\|_\|_\|_\|_\|_\|_\|_\|_\|_\|_\|_\|_\|_ Command Summary _\|_\|_\|_\|_\|_\|_\|_\|_\|_\|_\|_\|_\|_\|_\|_\|_\|_\|_\|_\|_
\& Name Value Pct Last Incr Pct
\& Name Value Pct Last Incr Pct
\& Select_scan 3244858 69.89% 2 100.00%
\& Select_range 1354177 29.17% 0 0.00%
\& Select_full_join 39479 0.85% 0 0.00%
......@@ -1261,7 +1261,7 @@ Displays data about InnoDB's semaphores and mutexes. Data source:
\&\*(L"\s-1STATUS_VARIABLES\*(R"\s0.
.IP "slave_io_status" 4
.IX Item "slave_io_status"
Displays data about the slave I/O thread. Data source:
Displays data about the slave I/O thread. Data source:
\&\*(L"\s-1STATUS_VARIABLES\*(R"\s0.
.IP "slave_sql_status" 4
.IX Item "slave_sql_status"
......@@ -1472,8 +1472,8 @@ Your display might now look like the following:
.PP
.Vb 1
\& Query List (? for help) localhost, 32:33, 0.11 QPS, 1 thd, 5.0.38\-log
\&
\& CXN Cmd Cnt ID User Host Time Query
\&
\& CXN Cmd Cnt ID User Host Time Query
\& localhost Query 49 12933 webusr localhost 19:38 SELECT * FROM
\& localhost Sending Da 23 2383 webusr localhost 12:43 SELECT col1,
\& localhost Sleep 120 140 webusr localhost 5:18:12
......@@ -1526,13 +1526,13 @@ rules are evaluated. The rules look like the following:
.PP
.Vb 9
\& state eq Locked black on_red
\& cmd eq Sleep white
\& user eq system user white
\& cmd eq Connect white
\& cmd eq Binlog Dump white
\& time > 600 red
\& time > 120 yellow
\& time > 60 green
\& cmd eq Sleep white
\& user eq system user white
\& cmd eq Connect white
\& cmd eq Binlog Dump white
\& time > 600 red
\& time > 120 yellow
\& time > 60 green
\& time > 30 cyan
.Ve
.PP
......@@ -1669,9 +1669,9 @@ show you something like this:
.PP
.Vb 1
\& Editing table definition for Buffer Pool. Press ? for help, q to quit.
\&
\& name hdr label src
\& cxn CXN Connection from which cxn
\&
\& name hdr label src
\& cxn CXN Connection from which cxn
\& buf_pool_size Size Buffer pool size IB_bp_buf_poo
\& buf_free Free Bufs Buffers free in the b IB_bp_buf_fre
\& pages_total Pages Pages total IB_bp_pages_t
......@@ -1924,15 +1924,15 @@ whitespace).
.Vb 2
\& use strict;
\& use warnings FATAL => \*(Aqall\*(Aq;
\&
\&
\& package Innotop::Plugin::Example;
\& # description: Adds an \*(Aqexample\*(Aq column to every table
\&
\&
\& sub new {
\& my ( $class, %vars ) = @_;
\& # Store reference to innotop\*(Aqs variables in $self
\& my $self = bless { %vars }, $class;
\&
\&
\& # Design the example column
\& my $col = {
\& hdr => \*(AqExample\*(Aq,
......@@ -1944,7 +1944,7 @@ whitespace).
\& tbl => \*(Aq\*(Aq,
\& trans => [],
\& };
\&
\&
\& # Add the column to every table.
\& my $tbl_meta = $vars{tbl_meta};
\& foreach my $tbl ( values %$tbl_meta ) {
......@@ -1953,17 +1953,17 @@ whitespace).
\& # Add the column to the list of visible columns
\& unshift @{$tbl\->{visible}}, \*(Aqexample\*(Aq;
\& }
\&
\&
\& # Be sure to return a reference to the object.
\& return $self;
\& }
\&
\&
\& # I\*(Aqd like to be called when a data set is being rendered into a table, please.
\& sub register_for_events {
\& my ( $self ) = @_;
\& return qw(set_to_tbl_pre_filter);
\& }
\&
\&
\& # This method will be called when the event fires.
\& sub set_to_tbl_pre_filter {
\& my ( $self, $rows, $tbl ) = @_;
......@@ -1972,7 +1972,7 @@ whitespace).
\& $row\->{example} = 1;
\& }
\& }
\&
\&
\& 1;
.Ve
.SS "Plugin Editor"
......@@ -2137,7 +2137,7 @@ Allen K. Smith,
Aurimas Mikalauskas,
Bartosz Fenski,
Brian Miezejewski,
Christian Hammers,
Christian Hammers,
Cyril Scetbon,
Dane Miller,
David Multer,
......
debian/additions/mariadb.cnf
View file @ 7a0fa9da
# The MariaDB configuration file
#
# The MariaDB/MySQL tools read configuration files in the following order:
# 0. "/etc/mysql/my.cnf" symlinks to this file, reason why all the rest is read.
# 1. "/etc/mysql/mariadb.cnf" (this file) to set global defaults,
# 2. "/etc/mysql/conf.d/*.cnf" to set global options.
# 3. "/etc/mysql/mariadb.conf.d/*.cnf" to set MariaDB-only options.
......@@ -17,9 +18,9 @@
# use it for options that affect everything
#
[client-server]
socket = /run/mysqld/mysqld.sock
#port = 3306
# Port or socket location where to connect
# port = 3306
socket = /run/mysqld/mysqld.sock
# Import all .cnf files from configuration directory
!includedir /etc/mysql/conf.d/
......
debian/additions/mariadb.conf.d/50-client.cnf
View file @ 7a0fa9da
......@@ -4,9 +4,6 @@
#
[client]
# Default is Latin1, if you need UTF-8 set this (also in server section)
# default-character-set = utf8mb4
# Example of client certificate usage
# ssl-cert=/etc/mysql/client-cert.pem
# ssl-key=/etc/mysql/client-key.pem
......
debian/additions/mariadb.conf.d/99-enable-encryption.cnf.preset 0 → 120000
View file @ 7a0fa9da
../../../support-files/rpm/enable_encryption.preset
\ No newline at end of file
debian/control
View file @ 7a0fa9da
......@@ -637,8 +637,10 @@ Depends: libcurl4,
mariadb-server-10.5 (= ${binary:Version}),
${misc:Depends},
${shlibs:Depends}
Description: S3 storage engine for MariaDB
Read only table stored in S3.
Description: Amazon S3 archival storage engine for MariaDB
The S3 storage engine allows one to archive MariaDB tables in Amazon S3 (or any
third-party public or private cloud that implements S3 API), but still have
them accessible in MariaDB in read-only mode.
Package: mariadb-plugin-rocksdb
Architecture: amd64 arm64 mips64el ppc64el
......
debian/salsa-ci.yml
View file @ 7a0fa9da
......@@ -73,7 +73,6 @@ autopkgtest:
piuparts:
extends: .test-piuparts
stage: test extras
allow_failure: true
blhc:
extends: .test-blhc
......@@ -84,11 +83,9 @@ blhc:
lintian:
extends: .test-lintian
allow_failure: true
missing-breaks:
extends: .test-missing-breaks
allow_failure: true
# In addition to Salsa-CI, also run these fully MariaDB specific build jobs
......@@ -124,7 +121,6 @@ fresh install:
except:
variables:
- $CI_COMMIT_TAG != null && $SALSA_CI_ENABLE_PIPELINE_ON_TAGS !~ /^(1|yes|true)$/
allow_failure: true
mariadb-10.3.x to mariadb-10.5.y upgrade:
stage: upgrade in Sid
......@@ -165,7 +161,6 @@ mariadb-10.3.x to mariadb-10.5.y upgrade:
except:
variables:
- $CI_COMMIT_TAG != null && $SALSA_CI_ENABLE_PIPELINE_ON_TAGS !~ /^(1|yes|true)$/
allow_failure: true
mariadb-10.3.x buster to mariadb-10.5 upgrade:
stage: upgrade from Buster/Stretch/Jessie
......@@ -210,7 +205,6 @@ mariadb-10.3.x buster to mariadb-10.5 upgrade:
except:
variables:
- $CI_COMMIT_TAG != null && $SALSA_CI_ENABLE_PIPELINE_ON_TAGS !~ /^(1|yes|true)$/
allow_failure: true
mariadb-10.1 to mariadb-10.5 upgrade:
stage: upgrade from Buster/Stretch/Jessie
......@@ -255,7 +249,6 @@ mariadb-10.1 to mariadb-10.5 upgrade:
except:
variables:
- $CI_COMMIT_TAG != null && $SALSA_CI_ENABLE_PIPELINE_ON_TAGS !~ /^(1|yes|true)$/
allow_failure: true
test basic features:
stage: test
......@@ -311,7 +304,6 @@ test basic features:
except:
variables:
- $CI_COMMIT_TAG != null && $SALSA_CI_ENABLE_PIPELINE_ON_TAGS !~ /^(1|yes|true)$/
allow_failure: true
# Build a piece of software that was designed for libmysqlclient-dev but using the
# libmariadb-dev-compat layer. Should always end up using libmariadb.so.3 run-time.
......@@ -335,7 +327,6 @@ build mariadbclient consumer Python-MySQLdb:
except:
variables:
- $CI_COMMIT_TAG != null && $SALSA_CI_ENABLE_PIPELINE_ON_TAGS !~ /^(1|yes|true)$/
allow_failure: true
libmysql* to libmariadb* upgrade:
stage: test extras
......@@ -375,7 +366,6 @@ libmysql* to libmariadb* upgrade:
except:
variables:
- $CI_COMMIT_TAG != null && $SALSA_CI_ENABLE_PIPELINE_ON_TAGS !~ /^(1|yes|true)$/
allow_failure: true
default-libmysqlclient-dev upgrade:
stage: upgrade in Sid
......@@ -402,7 +392,6 @@ default-libmysqlclient-dev upgrade:
except:
variables:
- $CI_COMMIT_TAG != null && $SALSA_CI_ENABLE_PIPELINE_ON_TAGS !~ /^(1|yes|true)$/
allow_failure: true
default-libmysqlclient-dev on buster upgrade:
stage: upgrade from Buster/Stretch/Jessie
......@@ -431,7 +420,6 @@ default-libmysqlclient-dev on buster upgrade:
except:
variables:
- $CI_COMMIT_TAG != null && $SALSA_CI_ENABLE_PIPELINE_ON_TAGS !~ /^(1|yes|true)$/
allow_failure: true
default-libmysqlclient-dev on stretch upgrade:
stage: upgrade from Buster/Stretch/Jessie
......@@ -460,7 +448,6 @@ default-libmysqlclient-dev on stretch upgrade:
except:
variables:
- $CI_COMMIT_TAG != null && $SALSA_CI_ENABLE_PIPELINE_ON_TAGS !~ /^(1|yes|true)$/
allow_failure: true
mariadb-connector-c on stretch upgrade:
stage: upgrade from Buster/Stretch/Jessie
......@@ -489,7 +476,6 @@ mariadb-connector-c on stretch upgrade:
except:
variables:
- $CI_COMMIT_TAG != null && $SALSA_CI_ENABLE_PIPELINE_ON_TAGS !~ /^(1|yes|true)$/
allow_failure: true
mysql-5.5 to mariadb-10.5 upgrade:
stage: upgrade from Buster/Stretch/Jessie
......@@ -534,7 +520,6 @@ mysql-5.5 to mariadb-10.5 upgrade:
except:
variables:
- $CI_COMMIT_TAG != null && $SALSA_CI_ENABLE_PIPELINE_ON_TAGS !~ /^(1|yes|true)$/
allow_failure: true
# Upgrading from MySQL 5.7 involves automatic renaming of auth_socket plugin
# to unix_socket and automaticly re-adding Password column in user table.
......@@ -581,7 +566,6 @@ mysql-5.7 to mariadb-10.5 upgrade:
except:
variables:
- $CI_COMMIT_TAG != null && $SALSA_CI_ENABLE_PIPELINE_ON_TAGS !~ /^(1|yes|true)$/
allow_failure: true
# Upgrading from MySQL 8.0 with datadir in place is not possible. Users need to do a data dump.
# The Debian maintainer scripts detect this situation and simply moves old datadir aside and start fresh.
......@@ -648,17 +632,14 @@ mariadb.org-10.5.x to mariadb-10.5 upgrade:
- sed -i "s/101/0/g" -i /usr/sbin/policy-rc.d # Enable automatic restarts from maint scripts
- cd ${WORKING_DIR} # Don't repeat this step, it's just cd ./debian/output
- apt-get update
- apt install -y curl systemctl # systemctl shim needed on platforms that don't have systemd
- apt install -y curl
- curl -sS https://mariadb.org/mariadb_release_signing_key.asc -o /etc/apt/trusted.gpg.d/mariadb.asc
- echo 'deb [arch=amd64,i386] http://mirror.one.com/mariadb/repo/10.5/debian sid main' > /etc/apt/sources.list.d/mariadb.list
- apt-get update
- apt-get install -y mariadb-server-10.5
# Verify installation of MySQL from Sid
- dpkg -l | grep -iE 'maria|mysql|galera' || true # List installed
# MariaDB.org version of 10.4 and early 10.5 do not install an init file, so
# it must be installed here manually
- cp /usr/share/mysql/mysql.init /etc/init.d/mysql; chmod +x /etc/init.d/mysql; service mysql start; sleep 5
- service mysql status
- service mariadb status
- mysql --skip-column-names -e "SELECT @@version, @@version_comment"
- mysql -e "SELECT Host,User,plugin,authentication_string FROM user;" mysql
- mysql -e "SELECT * FROM plugin;" mysql
......@@ -668,7 +649,6 @@ mariadb.org-10.5.x to mariadb-10.5 upgrade:
# Verify installation of MariaDB built in this commit
- dpkg -l | grep -iE 'maria|mysql|galera' || true # List installed
- mariadb --version # Client version
- service mysql status
- service mariadb status
- mkdir -p debug # Ensure dir exists before using it
- find /var/lib/mysql -ls > debug/var-lib-mysql.list || true # Ignore errors about "no such file or directory"
......
debian/source/lintian-overrides
View file @ 7a0fa9da
# Upstream fix pending: https://github.com/wolfSSL/wolfssl/pull/2785
source-is-missing extra/wolfssl/wolfssl/doc/formats/html/html_changes/menu.js line length is 679 characters (>512)
# Necessary for drop-in-place-replacement upgrades on mysql-server/-client
# since package breaks/replaces these but at the same time also provides them
version-substvar-for-external-package mariadb-client-core-10.5 -> mysql-client-5.5
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7