This reverts commit d04ee5f2.

Always consider current git working directory branch as the
target branch and never hard code that into configs.

Respect ignore-branch defined since commit
d691dc9a

(cherry picked from commit f3c046db)

Christian Ehrhardt authored Oct 16, 2017 and Ondrej Sury committed Dec 11, 2017

New tests were added along work for but those are still failing on
s390x. To pass dep8, but not skip on unittests entirely this disables
the particular test on s390x.

[1]: https://jira.mariadb.org/browse/MDEV-13412



Signed-off-by: Christian Ehrhardt <christian.ehrhardt@canonical.com>
(cherry picked from commit 34222e24)

(cherry picked from commit b0d7133f)

(cherry picked from commit 151fbc9a)

(cherry picked from commit c05c2081)

(cherry picked from commit 7a748da8)

Upstream version 10.1.29

Explicitly add dh_systemd_start snippets to mariadb-server-10.1 because it's all messed up with different name for sysvinit ('mysql') and systemd ('mariadb') (Closes: #865870)

Upstream version 10.1.25

Add @SYSTEMD_EXECSTARTPOST@ replacement token to mariadb@.service, so the /var/run/mysqld directory is created even for multi-server setup (Closes: #865083)

(cherry picked from commit 688b92d0)

Merge mytop script improvements from src:mytop package (Original patches by Philipp Matthias Hahn, Werner Detter, Olaf van der Spek, and Steffen Zieger) (Closes: #864762)

Andreas Beckmann authored Jun 07, 2017 and Ondrej Sury committed Jun 19, 2017

(cherry picked from commit f73ece56)

(cherry picked from commit 97b43b91)

(cherry picked from commit 56c5c5ad)

Upstream version 10.1.24