[mariadb-galera] Do not create test database by default Related: #1194611
Honza Horak
hhorak at fedoraproject.org
Wed Mar 11 22:54:44 UTC 2015
commit 5436a4b32e753cb258801552408d4a738981fdfc
Author: Honza Horak <hhorak at redhat.com>
Date: Tue Mar 3 23:05:35 2015 +0100
Do not create test database by default
Related: #1194611
Conflicts:
mariadb-galera.spec
mariadb-galera.spec | 4 ++++
mysql-notestdb.patch | 16 ++++++++++++++++
2 files changed, 20 insertions(+)
---
diff --git a/mariadb-galera.spec b/mariadb-galera.spec
index a2bb4be..ef2e0e2 100644
--- a/mariadb-galera.spec
+++ b/mariadb-galera.spec
@@ -156,6 +156,7 @@ Patch32: %{pkgnamepatch}-basedir.patch
Patch33: %{pkgnamepatch}-covscan-signexpr.patch
Patch34: %{pkgnamepatch}-covscan-stroverflow.patch
Patch36: %{pkgnamepatch}-ssltest.patch
+Patch37: %{pkgnamepatch}-notestdb.patch
BuildRequires: cmake
BuildRequires: libaio-devel
@@ -524,6 +525,7 @@ MariaDB is a community developed branch of MySQL.
%patch33 -p1
%patch34 -p1
%patch36 -p1
+%patch37 -p1
# removing bundled cmd-line-utils
rm -r cmd-line-utils
@@ -1182,6 +1184,8 @@ fi
- Rework disabled tests handling
- Fix typo in the config file
- Fix openssl_1 test
+- Do not create test database by default
+ Related: #1194611
* Sun Jan 25 2015 Honza Horak <hhorak at redhat.com> - 1:10.0.15-3
- Do not create log file in post script
diff --git a/mysql-notestdb.patch b/mysql-notestdb.patch
new file mode 100644
index 0000000..90a0d88
--- /dev/null
+++ b/mysql-notestdb.patch
@@ -0,0 +1,16 @@
+diff -up mariadb-10.0.16/scripts/mysql_install_db.pl.in.createtestdb mariadb-10.0.16/scripts/mysql_install_db.pl.in
+--- mariadb-10.0.16/scripts/mysql_install_db.pl.in.createtestdb 2015-03-03 23:02:33.287620715 +0100
++++ mariadb-10.0.16/scripts/mysql_install_db.pl.in 2015-03-03 23:02:56.664641960 +0100
+@@ -398,10 +398,10 @@ if ( $opt->{'skip-name-resolve'} and $re
+ }
+
+ # ----------------------------------------------------------------------
+-# Create database directories mysql & test
++# Create database directories mysql
+ # ----------------------------------------------------------------------
+
+-foreach my $dir ( $opt->{ldata}, "$opt->{ldata}/mysql", "$opt->{ldata}/test" )
++foreach my $dir ( $opt->{ldata}, "$opt->{ldata}/mysql" )
+ {
+ # FIXME not really the same as original "mkdir -p", but ok?
+ mkdir($dir, 0700) unless -d $dir;
More information about the scm-commits
mailing list