Skip to content

Commit b9fbe60

Browse files
ltangvalddahlerlend
authored andcommitted
Bug#30238756 UPGRADE FROM NATIVE MYSQL 8.0 TO CURRENT MYSQL 8.0 IS FAILING ON UBUNTU19.10
Added missing conflict declarations Change-Id: Id02b1976276f8bee5c7bf839db6ca13930ffa7c1
1 parent ba38c32 commit b9fbe60

File tree

2 files changed

+21
-45
lines changed

2 files changed

+21
-45
lines changed

packaging/deb-in/control.in

Lines changed: 20 additions & 44 deletions
Original file line numberDiff line numberDiff line change
@@ -90,24 +90,17 @@ Depends: ${shlibs:Depends}, ${misc:Depends}
9090
Breaks: mysql-@DEB_PRODUCTNAME@-server (<< 8.0.1),
9191
mysql-@DEB_NOTPRODUCTNAME@-server (<< 8.0.1),
9292
Conflicts: mysql,
93-
mysql-server-core-5.0,
94-
mysql-server-core-5.1,
95-
mysql-server-core-5.5,
96-
mysql-server-core-5.6,
9793
mysql-server-core-5.7,
94+
mysql-server-core-8.0,
9895
mysql-@DEB_NOTPRODUCTNAME@-server-core,
99-
mariadb-server-core-5.5,
100-
mariadb-server-core-10.0,
10196
mariadb-server-core-10.1,
102-
mariadb-server-core-10.2
97+
mariadb-server-core-10.2,
98+
mariadb-server-core-10.3
10399
Replaces: mysql-@DEB_PRODUCTNAME@-server (<< 8.0.1),
104100
mysql-@DEB_NOTPRODUCTNAME@-server (<< 8.0.1),
105101
mysql-@DEB_NOTPRODUCTNAME@-server-core,
106-
mysql-server-core-5.0,
107-
mysql-server-core-5.1,
108-
mysql-server-core-5.5,
109-
mysql-server-core-5.6,
110102
mysql-server-core-5.7,
103+
mysql-server-core-8.0
111104
Provides: virtual-mysql-server-core
112105
Description: MySQL Server Core Binaires
113106
The MySQL(TM) software delivers a very fast, multi-threaded, multi-user,
@@ -136,32 +129,21 @@ Depends: mysql-common (>= ${binary:Version}),
136129
Breaks: mysql-common (<< 8.0.1),
137130
libmysqlclient-dev (<< 5.7.14),
138131
Conflicts: mysql,
139-
mysql-client-5.0, mysql-client-core-5.0,
140-
mysql-client-5.1, mysql-client-core-5.1,
141-
mysql-client-5.5, mysql-client-core-5.5,
142-
mysql-client-5.6, mysql-client-core-5.6,
143132
mysql-client-5.7, mysql-client-core-5.7,
133+
mysql-client-8.0, mysql-client-core-8.0,
144134
mysql-@DEB_NOTPRODUCTNAME@-client,
145135
@DEB_CONTROL_CLIENT_CONFLICT_NDB@,
146-
mariadb-client-5.5, mariadb-client-core-5.5,
147-
mariadb-client-10.0, mariadb-client-core-10.0,
148136
mariadb-client-10.1, mariadb-client-core-10.1,
149137
mariadb-client-10.2, mariadb-client-core-10.2,
150-
mysql-server-5.0, mysql-server-core-5.0,
151-
mysql-server-5.1, mysql-server-core-5.1,
152-
mysql-server-5.5, mysql-server-core-5.5,
153-
mysql-server-5.6, mysql-server-core-5.6,
138+
mariadb-client-10.3, mariadb-client-core-10.3,
154139
mysql-server-5.7, mysql-server-core-5.7,
155-
mariadb-server-5.5, mariadb-server-core-5.5,
156-
mariadb-server-10.0, mariadb-server-core-10.0,
140+
mysql-server-8.0, mysql-server-core-8.0,
157141
mariadb-server-10.1, mariadb-server-core-10.1,
158142
mariadb-server-10.2, mariadb-server-core-10.2,
143+
mariadb-server-10.3, mariadb-server-core-10.3,
159144
Replaces: mysql,
160-
mysql-client-5.0, mysql-client-core-5.0,
161-
mysql-client-5.1, mysql-client-core-5.1,
162-
mysql-client-5.5, mysql-client-core-5.5,
163-
mysql-client-5.6, mysql-client-core-5.6,
164145
mysql-client-5.7, mysql-client-core-5.7,
146+
mysql-client-8.0, mysql-client-core-8.0,
165147
mysql-@DEB_NOTPRODUCTNAME@-client,
166148
@DEB_CONTROL_CLIENT_CONFLICT_NDB@,
167149
mysql-common (<< 8.0.1),
@@ -182,22 +164,15 @@ Breaks: libmysqlclient-dev (<< 5.7.14),
182164
mysql-@DEB_PRODUCTNAME@-client (<< 8.0.1),
183165
mysql-@DEB_NOTPRODUCTNAME@-client (<< 8.0.1),
184166
Conflicts: mysql,
185-
mysql-client-core-5.0,
186-
mysql-client-core-5.1,
187-
mysql-client-core-5.5,
188-
mysql-client-core-5.6,
189167
mysql-client-core-5.7,
168+
mysql-client-core-8.0,
190169
mysql-@DEB_NOTPRODUCTNAME@-client-core,
191-
mariadb-client-core-5.5,
192-
mariadb-client-core-10.0,
193170
mariadb-client-core-10.1,
194-
mariadb-client-core-10.2
171+
mariadb-client-core-10.2,
172+
mariadb-client-core-10.3
195173
Replaces: mysql,
196-
mysql-client-core-5.0,
197-
mysql-client-core-5.1,
198-
mysql-client-core-5.5,
199-
mysql-client-core-5.6,
200174
mysql-client-core-5.7,
175+
mysql-client-core-8.0,
201176
mysql-@DEB_NOTPRODUCTNAME@-client,
202177
mysql-common (<< 5.7.17),
203178
mysql-@DEB_PRODUCTNAME@-client (<< 8.0.1),
@@ -232,15 +207,16 @@ Architecture: any
232207
Pre-depends: debconf (>= 0.2.17), ${misc:Pre-Depends}
233208
Multi-Arch: foreign
234209
Depends: ${shlibs:Depends}, ${misc:Depends}
235-
Conflicts: mysql, mysql-server-5.6, mysql-server-core-5.6,
236-
mysql-client-5.6, mysql-client-core-5.6,
210+
Conflicts: mysql,
237211
mysql-server-5.7, mysql-server-core-5.7,
238212
mysql-client-5.7, mysql-client-core-5.7,
213+
mysql-server-8.0, mysql-server-core-8.0,
214+
mysql-client-8.0, mysql-client-core-8.0,
239215
mariadb-server-5.5, percona-xtradb-cluster-common-5.5,
240216
mysql-common (<< 5.7.14)
241-
Replaces: mysql, mysql-server-5.5, mysql-server-core-5.5, libmysqlclient-dev,
242-
mysql-server-5.6, mysql-server-core-5.6,
217+
Replaces: mysql, libmysqlclient-dev,
243218
mysql-server-5.7, mysql-server-core-5.7,
219+
mysql-server-8.0, mysql-server-core-8.0,
244220
mariadb-server-5.5, percona-xtradb-cluster-common-5.5,
245221
mysql-common (<< 5.7.14)
246222
Provides: mysql-common
@@ -260,6 +236,7 @@ Depends: libmysqlclient21 (= ${binary:Version}),
260236
Breaks: libmysqld-dev
261237
Replaces: mysql-client-5.6, mysql-client-core-5.6,
262238
mysql-client-5.7, mysql-client-core-5.7,
239+
mysql-client-8.0, mysql-client-core-8.0,
263240
libmysqld-dev
264241
Description: MySQL development headers
265242
The MySQL(TM) software delivers a very fast, multi-threaded, multi-user,
@@ -289,8 +266,7 @@ Depends: mysql-@DEB_PRODUCTNAME@-server (= ${binary:Version}),
289266
Breaks: mysql-@DEB_PRODUCTNAME@-server (<< 5.7.14),
290267
mysql-@DEB_PRODUCTNAME@-client (<< 5.7.14)
291268
Conflicts: mysql,
292-
mysql-testsuite-5.0, mysql-testsuite-5.1, mysql-testsuite-5.5,
293-
mysql-testsuite-5.6, mysql-testsuite-5.7, mysql-@DEB_NOTPRODUCTNAME@-test,
269+
mysql-testsuite-8.0, mysql-testsuite-5.7, mysql-@DEB_NOTPRODUCTNAME@-test,
294270
mariadb-test, mariadb-test-data
295271
Description: MySQL Test Run MTR - The MySQL testsuite
296272
The MySQL(TM) software delivers a very fast, multi-threaded, multi-user,

packaging/deb-in/mysql-packagesource-server.config.in

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@ then
6060

6161
set -e
6262

63-
PKG_LIST=mysql-server-5.5:mysql-server-5.6:mysql-server-5.7:mysql-community-server:mysql-commercial-server
63+
PKG_LIST=mysql-server-5.5:mysql-server-5.6:mysql-server-5.7:mysql-server-8.0:mysql-community-server:mysql-commercial-server
6464
INSTALLED_PKG=none
6565
MYSQLDATA=/var/lib/mysql
6666

0 commit comments

Comments
 (0)