From 548ec3a088a2444881e1245a237f81cea1671969 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Otto=20Kek=C3=A4l=C3=A4inen?= Date: Wed, 11 Apr 2018 09:14:58 +0300 Subject: Deb: Update documentation and fix spelling errors --- debian/additions/debian-start | 2 ++ debian/additions/innotop/changelog.innotop | 2 +- debian/additions/innotop/innotop | 14 +++++++------- debian/additions/innotop/innotop.1 | 6 +++--- debian/mariadb-server-10.3.mysql.default | 15 +++++++++++++++ debian/mariadb-server-10.3.postinst | 2 +- 6 files changed, 29 insertions(+), 12 deletions(-) (limited to 'debian') diff --git a/debian/additions/debian-start b/debian/additions/debian-start index dea22c48f76..40c248fd81f 100755 --- a/debian/additions/debian-start +++ b/debian/additions/debian-start @@ -4,6 +4,8 @@ # # Changes to this file will be preserved when updating the Debian package. # +# NOTE: This file is read only by the traditional SysV init script, not systemd. +# source /usr/share/mysql/debian-start.inc.sh diff --git a/debian/additions/innotop/changelog.innotop b/debian/additions/innotop/changelog.innotop index 1816595240b..67bc52698e7 100644 --- a/debian/additions/innotop/changelog.innotop +++ b/debian/additions/innotop/changelog.innotop @@ -77,7 +77,7 @@ Changelog for innotop: * remove cxn from $meta->{group_by} if there's only one connection displayed * fix for issue 19 - cxn column won't become visible when viewing two connections after having viewed one connection - * suppress errors resulting from the addition of a 'BACKGROUND THREAD' + * supress errors resulting from the addition of a 'BACKGROUND THREAD' section in the output of 'show innodb status' * possible fix for issue 22 - Useless use of a constant in void context * small change to set_to_tbl() around hiding the cxn column if there diff --git a/debian/additions/innotop/innotop b/debian/additions/innotop/innotop index b0134e0bc91..f958eba432b 100644 --- a/debian/additions/innotop/innotop +++ b/debian/additions/innotop/innotop @@ -17,7 +17,7 @@ # You should have received a copy of the GNU General Public License along with # this program; if not, write to the Free Software Foundation, Inc., 51 Franklin -# Street, Fifth Floor, Boston, MA 02111-1301 USA +# Street, Fifth Floor, Boston, MA 02110-1301 USA use strict; use warnings FATAL => 'all'; @@ -1438,8 +1438,8 @@ systems, you can issue `man perlgpl' or `man perlartistic' to read these licenses. You should have received a copy of the GNU General Public License along with -this program; if not, write to the Free Software Foundation, Inc., 51 Franklin -Street, Fifth Floor, Boston, MA 02111-1301 USA. +this program; if not, write to the Free Software Foundation, Inc., 59 Temple +Place, Suite 330, Boston, MA 02111-1307 USA. LICENSE # Configuration information and global setup {{{1 @@ -4657,7 +4657,7 @@ my %stmt_maker_for = ( my $sth; eval { # This can fail if the table doesn't exist, INFORMATION_SCHEMA doesn't exist, etc. my $cols = $dbh->selectall_arrayref(q{SHOW /*innotop*/ COLUMNS FROM INFORMATION_SCHEMA.PROCESSLIST LIKE 'TIME_MS'}); - if ( @$cols ) { # The TIME_MS column exists + if ( @$cols ) { # The TIME_MS colum exists $sth = $dbh->prepare(q{SELECT /*innotop*/ ID, USER, HOST, DB, COMMAND, CASE WHEN TIME_MS/1000 > 365*86400 THEN TIME ELSE TIME_MS/1000 END AS TIME, STATE, INFO FROM INFORMATION_SCHEMA.PROCESSLIST}); } }; @@ -11653,7 +11653,7 @@ show you something like this: pages_modified Dirty Pages Pages modified (dirty IB_bp_pages_m buf_pool_hit_rate Hit Rate Buffer pool hit rate IB_bp_buf_poo total_mem_alloc Memory Total memory allocate IB_bp_total_m - add_pool_alloc Add'l Pool Additional pool alloca IB_bp_add_poo + add_pool_alloc Add'l Pool Additonal pool alloca IB_bp_add_poo The first line shows which table you're editing, and reminds you again to press '?' for a list of key mappings. The rest is a tabular representation of the @@ -12233,8 +12233,8 @@ systems, you can issue `man perlgpl' or `man perlartistic' to read these licenses. You should have received a copy of the GNU General Public License along with -this program; if not, write to the Free Software Foundation, Inc., 51 Franklin -Street, Fifth Floor, Boston, MA 02111-1301 USA. +this program; if not, write to the Free Software Foundation, Inc., 59 Temple +Place, Suite 330, Boston, MA 02111-1307 USA. Execute innotop and press '!' to see this information at any time. diff --git a/debian/additions/innotop/innotop.1 b/debian/additions/innotop/innotop.1 index 7079ff2c4a4..7cd275a79f2 100644 --- a/debian/additions/innotop/innotop.1 +++ b/debian/additions/innotop/innotop.1 @@ -1678,7 +1678,7 @@ show you something like this: \& pages_modified Dirty Pages Pages modified (dirty IB_bp_pages_m \& buf_pool_hit_rate Hit Rate Buffer pool hit rate IB_bp_buf_poo \& total_mem_alloc Memory Total memory allocate IB_bp_total_m -\& add_pool_alloc Add\*(Aql Pool Additional pool alloca IB_bp_add_poo +\& add_pool_alloc Add\*(Aql Pool Additonal pool alloca IB_bp_add_poo .Ve .PP The first line shows which table you're editing, and reminds you again to press @@ -2183,8 +2183,8 @@ systems, you can issue `man perlgpl' or `man perlartistic' to read these licenses. .PP You should have received a copy of the \s-1GNU\s0 General Public License along with -this program; if not, write to the Free Software Foundation, Inc., 51 Franklin -Street, Fifth Floor, Boston, \s-1MA\s0 02111\-1301 \s-1USA\s0. +this program; if not, write to the Free Software Foundation, Inc., 59 Temple +Place, Suite 330, Boston, \s-1MA 02111\-1307 USA.\s0 .PP Execute innotop and press '!' to see this information at any time. .SH "AUTHOR" diff --git a/debian/mariadb-server-10.3.mysql.default b/debian/mariadb-server-10.3.mysql.default index 22f08e54427..146c5a87a84 100644 --- a/debian/mariadb-server-10.3.mysql.default +++ b/debian/mariadb-server-10.3.mysql.default @@ -1,3 +1,18 @@ +# +# NOTE: This file is read only by the traditional SysV init script. +# Debian 9 and Ubuntu 17.04 onwards do not normally read this file as they use +# systemd by default. +# +# For similar behaviour, systemd users should override ExecStart by dropping +# files into /etc/systemd/system/mariadb.service.d/ +# +# See also: +# https://wiki.debian.org/Teams/pkg-systemd/Packaging#overriding_options_and_.2Fetc.2Fdefault_handling +# https://mariadb.com/kb/en/mariadb/systemd/ +# +# Note also that MariaDB systemd does _not_ utilize mysqld_safe nor debian-start. + + # The delay in seconds the init script waits for the server to be up and running after having started "mysqld_safe" to run the "/etc/mysql/debian-start" script. # If the server is still not responding after the delay, the script won't be executed and an error will be thrown on the syslog. # Default: 30 diff --git a/debian/mariadb-server-10.3.postinst b/debian/mariadb-server-10.3.postinst index c9fd3d31334..aa6ea07a888 100644 --- a/debian/mariadb-server-10.3.postinst +++ b/debian/mariadb-server-10.3.postinst @@ -91,7 +91,7 @@ case "$1" in mv "$targetdir" "$mysql_tmp" cat << EOF > "$mysql_tmp/README" -Ff you're reading this, it's most likely because you had replaced /var/lib/mysql +If you're reading this, it's most likely because you had replaced /var/lib/mysql with a symlink, then upgraded to a new version of mysql, and then dpkg removed your symlink (see #182747 and others). The mysql packages noticed that this happened, and as a workaround have restored it. However, because -- cgit v1.2.1