Skip to content

Commit 22e56c5

Browse files
committed
Bug #19579105 SERVICE START FAILING WITH SLES11 5.7.5-COMMUNITY REPO PACKAGES
Fixed by adding --rpm to mysql_install_db command Also some corrections enterprise -> commercial
1 parent f22b05f commit 22e56c5

File tree

2 files changed

+11
-11
lines changed

2 files changed

+11
-11
lines changed

packaging/rpm-sles/mysql.init

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -72,7 +72,7 @@ install_db () {
7272
[ -d "$datadir/mysql" ] && return 0
7373

7474
# Create initial db
75-
/usr/bin/mysql_install_db --rpm --datadir="$datadir" --user=mysql
75+
/usr/bin/mysql_install_db --datadir="$datadir" --user=mysql
7676
return $?
7777
}
7878

packaging/rpm-sles/mysql.spec.in

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -129,8 +129,8 @@ Requires: perl-base
129129
Provides: MySQL-server-advanced = %{version}-%{release}
130130
Obsoletes: MySQL-server-advanced < %{version}-%{release}
131131
Obsoletes: mysql-community-server < %{version}-%{release}
132-
Requires: mysql-enterprise-client = %{version}-%{release}
133-
Requires: mysql-enterprise-common = %{version}-%{release}
132+
Requires: mysql-commercial-client = %{version}-%{release}
133+
Requires: mysql-commercial-common = %{version}-%{release}
134134
%else
135135
Provides: MySQL-server = %{version}-%{release}
136136
Requires: mysql-community-client = %{version}-%{release}
@@ -184,7 +184,7 @@ Group: Applications/Databases
184184
Provides: MySQL-client-advanced = %{version}-%{release}
185185
Obsoletes: MySQL-client-advanced < %{version}-%{release}
186186
Obsoletes: mysql-community-client < %{version}-%{release}
187-
Requires: mysql-enterprise-libs = %{version}-%{release}
187+
Requires: mysql-commercial-libs = %{version}-%{release}
188188
%else
189189
Provides: MySQL-client = %{version}-%{release}
190190
Requires: mysql-community-libs = %{version}-%{release}
@@ -219,7 +219,7 @@ Group: Applications/Databases
219219
Provides: MySQL-test-advanced = %{version}-%{release}
220220
Obsoletes: MySQL-test-advanced < %{version}-%{release}
221221
Obsoletes: mysql-community-test < %{version}-%{release}
222-
Requires: mysql-enterprise-server = %{version}-%{release}
222+
Requires: mysql-commercial-server = %{version}-%{release}
223223
%else
224224
Provides: MySQL-test = %{version}-%{release}
225225
Requires: mysql-community-server = %{version}-%{release}
@@ -240,7 +240,7 @@ Summary: MySQL benchmark suite
240240
Group: Applications/Databases
241241
%if 0%{?commercial}
242242
Obsoletes: mysql-community-bench < %{version}-%{release}
243-
Requires: mysql-enterprise-server = %{version}-%{release}
243+
Requires: mysql-commercial-server = %{version}-%{release}
244244
%else
245245
Requires: mysql-community-server = %{version}-%{release}
246246
%endif
@@ -261,7 +261,7 @@ Group: Applications/Databases
261261
Provides: MySQL-devel-advanced = %{version}-%{release}
262262
Obsoletes: MySQL-devel-advanced < %{version}-%{release}
263263
Obsoletes: mysql-community-devel < %{version}-%{release}
264-
Requires: mysql-enterprise-libs = %{version}-%{release}
264+
Requires: mysql-commercial-libs = %{version}-%{release}
265265
%else
266266
Provides: MySQL-devel = %{version}-%{release}
267267
Requires: mysql-community-libs = %{version}-%{release}
@@ -284,7 +284,7 @@ Group: Applications/Databases
284284
Provides: MySQL-shared-advanced = %{version}-%{release}
285285
Obsoletes: MySQL-shared-advanced < %{version}-%{release}
286286
Obsoletes: mysql-community-libs < %{version}-%{release}
287-
Requires: mysql-enterprise-common = %{version}-%{release}
287+
Requires: mysql-commercial-common = %{version}-%{release}
288288
%else
289289
Provides: MySQL-shared = %{version}-%{release}
290290
Requires: mysql-community-common = %{version}-%{release}
@@ -309,7 +309,7 @@ Group: Applications/Databases
309309
Provides: MySQL-embedded-advanced = %{version}-%{release}
310310
Obsoletes: MySQL-embedded-advanced < %{version}-%{release}
311311
Obsoletes: mysql-community-embedded < %{version}-%{release}
312-
Requires: mysql-enterprise-common = %{version}-%{release}
312+
Requires: mysql-commercial-common = %{version}-%{release}
313313
%else
314314
Provides: MySQL-embedded = %{version}-%{release}
315315
Requires: mysql-community-common = %{version}-%{release}
@@ -336,8 +336,8 @@ Summary: Development header files and libraries for MySQL as an embeddabl
336336
Group: Applications/Databases
337337
%if 0%{?commercial}
338338
Obsoletes: mysql-community-embedded-devel < %{version}-%{release}
339-
Requires: mysql-enterprise-devel = %{version}-%{release}
340-
Requires: mysql-enterprise-embedded = %{version}-%{release}
339+
Requires: mysql-commercial-devel = %{version}-%{release}
340+
Requires: mysql-commercial-embedded = %{version}-%{release}
341341
%else
342342
Requires: mysql-community-devel = %{version}-%{release}
343343
Requires: mysql-community-embedded = %{version}-%{release}

0 commit comments

Comments
 (0)