From 1ba13114e22470625bde892b7b36b30a465c2474 Mon Sep 17 00:00:00 2001
From: Honza Horak <hhorak@redhat.com>
Date: Tue, 3 Mar 2015 23:05:35 +0100
Subject: [PATCH] Do not create test database by default Related: #1194611

---
 mariadb.spec         |  4 ++++
 mysql-notestdb.patch | 16 ++++++++++++++++
 2 files changed, 20 insertions(+)
 create mode 100644 mysql-notestdb.patch

diff --git a/mariadb.spec b/mariadb.spec
index 3b91308..f218db3 100644
--- a/mariadb.spec
+++ b/mariadb.spec
@@ -159,6 +159,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
@@ -496,6 +497,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
@@ -1130,6 +1132,8 @@ fi
 * Tue Mar 03 2015 Honza Horak <hhorak@redhat.com> - 1:10.0.16-6
 - Check permissions when starting service on RHEL-6
   Resolves: #1194699
+- Do not create test database by default
+  Related: #1194611
 
 * Fri Feb 13 2015 Matej Muzila <mmuzila@redhat.com> - 1:10.0.16-4
 - Enable tokudb
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;