Merge branch '10.0' into 10.1

6 files changed, 14 insertions, 18 deletions

diff --git a/debian/additions/innotop/innotop b/debian/additions/innotop/innotop
index 646f0d7f0fb..9179a0d7a81 100644
--- a/debian/additions/innotop/innotop
+++ b/debian/additions/innotop/innotop
@@ -1503,7 +1503,7 @@ my %exprs = (
 
 my %columns = (
    active_secs                 => { hdr => 'SecsActive',          num => 1, label => 'Seconds transaction has been active', },
-   add_pool_alloc              => { hdr => 'Add\'l Pool',         num => 1, label => 'Additonal pool allocated' },
+   add_pool_alloc              => { hdr => 'Add\'l Pool',         num => 1, label => 'Additional pool allocated' },
    attempted_op                => { hdr => 'Action',              num => 0, label => 'The action that caused the error' },
    awe_mem_alloc               => { hdr => 'AWE Memory',          num => 1, label => '[Windows] AWE memory allocated' },
    binlog_cache_overflow       => { hdr => 'Binlog Cache',        num => 1, label => 'Transactions too big for binlog cache that went to disk' },
@@ -10365,7 +10365,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   Additonal pool alloca  IB_bp_add_poo
+ add_pool_alloc     Add'l Pool   Additional 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
diff --git a/debian/additions/innotop/innotop.1 b/debian/additions/innotop/innotop.1
index b2e7fce084e..fbb481f9b94 100644
--- a/debian/additions/innotop/innotop.1
+++ b/debian/additions/innotop/innotop.1
@@ -1579,7 +1579,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   Additonal pool alloca  IB_bp_add_poo
+\& add_pool_alloc     Add\*(Aql Pool   Additional pool alloca  IB_bp_add_poo
 .Ve
 .PP
 The first line shows which table you're editing, and reminds you again to press
diff --git a/debian/additions/mysqlreport b/debian/additions/mysqlreport
index 772d6399437..3e116bf4a43 100755
--- a/debian/additions/mysqlreport
+++ b/debian/additions/mysqlreport
@@ -366,7 +366,7 @@ sub read_relative_infiles
 
             # The infile must begin with the system variable values.
             # Therefore, the first occurance of Aborted_clients indicates the beginning
-            # of the first set of status values if no sets have occured yet ($stat_n == 0).
+            # of the first set of status values if no sets have occurred yet ($stat_n == 0).
             # In this case, the following status values are printed to the current fh,
             # along with the system variable values read thus far, until Aborted_clients
             # occurs again. Then begins the second and subsequent sets of status values.
diff --git a/debian/copyright b/debian/copyright
index 5207620b411..1a31a958b99 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -9,7 +9,7 @@ The MariaDB packages were initally made by http://ourdelta.org/, and
 are now managed by the MariaDB development team,
 maria-developers@lists.launchpad.net
 
-MariaDB can be downloaded from http://downloads.askmonty.org/mariadb/
+MariaDB can be downloaded from https://downloads.mariadb.org/ 
 
 Copyright:
 
diff --git a/debian/mariadb-server-10.1.mysql-server.logrotate b/debian/mariadb-server-10.1.mysql-server.logrotate
index 789ad353e43..a19e9ec46a2 100644
--- a/debian/mariadb-server-10.1.mysql-server.logrotate
+++ b/debian/mariadb-server-10.1.mysql-server.logrotate
@@ -10,18 +10,11 @@
 	compress
 	sharedscripts
 	postrotate
-		test -x /usr/bin/mysqladmin || exit 0
+          test -x /usr/bin/mysqladmin || exit 0
 
-		# If this fails, check debian.conf! 
-		MYADMIN="/usr/bin/mysqladmin --defaults-file=/etc/mysql/debian.cnf"
-		if [ -z "`$MYADMIN ping 2>/dev/null`" ]; then
-		  # Really no mysqld or rather a missing debian-sys-maint user?
-		  # If this occurs and is not a error please report a bug.
-		  if ps cax | grep -q mysqld; then
- 		    exit 1
-		  fi 
-		else
-		  $MYADMIN flush-logs
-		fi
+          if [ -f `my_print_defaults --mysqld | grep -oP "pid-file=\K[^$]+"` ]; then
+            # If this fails, check debian.conf!
+            mysqladmin --defaults-file=/etc/mysql/debian.cnf flush-logs
+          fi
 	endscript
 }
diff --git a/debian/mariadb-server-10.1.postinst b/debian/mariadb-server-10.1.postinst
index 63b7c0c0be2..ccf7d5c88ca 100644
--- a/debian/mariadb-server-10.1.postinst
+++ b/debian/mariadb-server-10.1.postinst
@@ -240,7 +240,10 @@ db_stop # in case invoke failes
 # Thus MariaDB server is started via init.d script, which in turn redirects to
 # systemctl. If we upgrade from MySQL mysql.service may be masked, which also
 # means init.d script is disabled. Unmask mysql service explicitely.
-deb-systemd-helper unmask mysql.service >/dev/null || true
+# Check first that the command exists, to avoid emitting any warning messages.
+if [ -x "$(command -v deb-systemd-helper)" ]; then
+  deb-systemd-helper unmask mysql.service > /dev/null
+fi
 
 #DEBHELPER#