From 0d345ec2e358ec8f42865be9a17e6f007585931d Mon Sep 17 00:00:00 2001
From: Sergei Golubchik <serg@mariadb.org>
Date: Thu, 28 Nov 2019 14:01:46 +0100
Subject: [PATCH] Fix upgrade errors on eoan

mariadb packages conflict with mysql-8.0
---
 debian/control | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/debian/control b/debian/control
index 8896f4d1dcdfe..916b403b33b75 100644
--- a/debian/control
+++ b/debian/control
@@ -259,6 +259,7 @@ Conflicts: mariadb-client-10.0,
            mysql-client-core-5.5,
            mysql-client-core-5.6,
            mysql-client-core-5.7,
+           mysql-client-core-8.0,
            virtual-mysql-client-core
 Replaces: mariadb-client-10.0,
           mariadb-client-10.1,
@@ -282,6 +283,7 @@ Replaces: mariadb-client-10.0,
           mysql-client-core-5.5,
           mysql-client-core-5.6,
           mysql-client-core-5.7,
+          mysql-client-core-8.0,
           virtual-mysql-client-core
 Provides: default-mysql-client-core,
           mysql-client-core,
@@ -320,6 +322,7 @@ Conflicts: mariadb-client (<< ${source:Version}),
            mysql-client-5.5,
            mysql-client-5.6,
            mysql-client-5.7,
+           mysql-client-8.0,
            virtual-mysql-client
 Replaces: mariadb-client (<< ${source:Version}),
           mariadb-client-10.0,
@@ -335,6 +338,7 @@ Replaces: mariadb-client (<< ${source:Version}),
           mysql-client-5.5,
           mysql-client-5.6,
           mysql-client-5.7,
+          mysql-client-8.0,
           virtual-mysql-client
 Provides: default-mysql-client,
           mysql-client,
@@ -373,6 +377,7 @@ Conflicts: mariadb-server-core-10.0,
            mysql-server-core-5.5,
            mysql-server-core-5.6,
            mysql-server-core-5.7,
+           mysql-server-core-8.0,
            virtual-mysql-server-core
 Breaks: mariadb-client-10.0,
         mariadb-client-10.1,
@@ -397,6 +402,7 @@ Replaces: mariadb-client-10.0,
           mysql-server-core-5.5,
           mysql-server-core-5.6,
           mysql-server-core-5.7,
+          mysql-server-core-8.0,
           virtual-mysql-server-core
 Provides: default-mysql-server-core,
           mysql-server-core,
@@ -457,6 +463,7 @@ Conflicts: mariadb-server (<< ${source:Version}),
            mysql-server-5.5,
            mysql-server-5.6,
            mysql-server-5.7,
+           mysql-server-8.0,
            virtual-mysql-server
 Replaces: libmariadbclient-dev (<< 5.5.0),
           libmariadbclient16 (<< 5.3.4),
@@ -479,6 +486,7 @@ Replaces: libmariadbclient-dev (<< 5.5.0),
           mysql-server-5.5,
           mysql-server-5.6,
           mysql-server-5.7,
+          mysql-server-8.0,
           virtual-mysql-server
 Provides: default-mysql-server,
           virtual-mysql-server
@@ -724,6 +732,7 @@ Breaks: mariadb-server-5.5,
         mysql-testsuite-5.5,
         mysql-testsuite-5.6,
         mysql-testsuite-5.7,
+        mysql-testsuite-8.0,
         virtual-mysql-testsuite
 Replaces: mariadb-server-5.5,
           mariadb-test-10.0,
@@ -734,6 +743,7 @@ Replaces: mariadb-server-5.5,
           mysql-testsuite-5.5,
           mysql-testsuite-5.6,
           mysql-testsuite-5.7,
+          mysql-testsuite-8.0,
           virtual-mysql-testsuite
 Provides: virtual-mysql-testsuite
 Suggests: patch