From 2c441f176ae7d101403c39b6772310676260997c Mon Sep 17 00:00:00 2001
From: Jeremy Lecour <jlecour@evolix.fr>
Date: Sat, 1 May 2021 22:19:31 +0200
Subject: [PATCH] mysql: mariadb-client-10.5 on Debian 11

---
 CHANGELOG.md                 |  1 +
 mysql-oracle/tasks/utils.yml | 16 ++++++++++++----
 mysql/tasks/utils.yml        | 16 ++++++++++++----
 3 files changed, 25 insertions(+), 8 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index c04a50c2..a0ff32ad 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -19,6 +19,7 @@ The **patch** part changes incrementally at each release.
 ### Changed
 
 * listupgrade: upstream release 21.06.3
+* mysql: mariadb-client-10.5 on Debian 11
 * mysql: use python3 with Debian 11 and later
 
 ### Fixed
diff --git a/mysql-oracle/tasks/utils.yml b/mysql-oracle/tasks/utils.yml
index e7573afe..e0520cee 100644
--- a/mysql-oracle/tasks/utils.yml
+++ b/mysql-oracle/tasks/utils.yml
@@ -17,7 +17,7 @@
 
 # mytop
 
-- name: "mytop is installed (jessie)"
+- name: "mytop is installed (Debian 9)"
   apt:
     name: mytop
     state: present
@@ -32,7 +32,7 @@
 #     name: mysql-utilities
 #   when: ansible_distribution_major_version is version('9', '>=')
 
-- name: "mytop dependencies are installed (stretch)"
+- name: "mytop dependencies are installed (Buster)"
   apt:
     name:
       - libconfig-inifiles-perl
@@ -46,13 +46,21 @@
     - mysql
   when: ansible_distribution_release == "stretch"
 
-- name: "Install dependencies for mytop (Debian 10 or later)"
+- name: "Install dependencies for mytop (Debian 10)"
   apt:
     name:
       - mariadb-client-10.3
       - libconfig-inifiles-perl
       - libterm-readkey-perl
-  when: ansible_distribution_major_version is version('10', '>=')
+  when: ansible_distribution_release == "buster"
+
+- name: "Install dependencies for mytop (Debian 11 or later)"
+  apt:
+    name:
+      - mariadb-client-10.5
+      - libconfig-inifiles-perl
+      - libterm-readkey-perl
+  when: ansible_distribution_major_version is version('11', '>=')
 
 - include_role:
     name: evolix/remount-usr
diff --git a/mysql/tasks/utils.yml b/mysql/tasks/utils.yml
index b4abf059..f1a9cb24 100644
--- a/mysql/tasks/utils.yml
+++ b/mysql/tasks/utils.yml
@@ -17,7 +17,7 @@
 
 # mytop
 
-- name: "Install mytop (jessie)"
+- name: "Install mytop (Debian 9)"
   apt:
     name: mytop
     state: present
@@ -27,7 +27,7 @@
     - mysql
   when: ansible_distribution_release == "jessie"
 
-- name: "Install dependencies for mytop (stretch)"
+- name: "Install dependencies for mytop (Debian 9)"
   apt:
     name:
       - mariadb-client-10.1
@@ -35,13 +35,21 @@
       - libterm-readkey-perl
   when: ansible_distribution_release == "stretch"
 
-- name: "Install dependencies for mytop (Debian 10 or later)"
+- name: "Install dependencies for mytop (Debian 10)"
   apt:
     name:
       - mariadb-client-10.3
       - libconfig-inifiles-perl
       - libterm-readkey-perl
-  when: ansible_distribution_major_version is version('10', '>=')
+  when: ansible_distribution_release == "buster"
+
+- name: "Install dependencies for mytop (Debian 11 or later)"
+  apt:
+    name:
+      - mariadb-client-10.5
+      - libconfig-inifiles-perl
+      - libterm-readkey-perl
+  when: ansible_distribution_major_version is version('11', '>=')
 
 - name: Read debian-sys-maint password
   shell: 'cat /etc/mysql/debian.cnf | grep -m1 "password = .*" | cut -d" " -f3'