Hello community,

here is the log from the commit of package mariadb for openSUSE:Factory checked 
in at 2015-09-13 09:42:17
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/mariadb (Old)
 and      /work/SRC/openSUSE:Factory/.mariadb.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Package is "mariadb"

Changes:
--------
--- /work/SRC/openSUSE:Factory/mariadb/mariadb.changes  2015-07-19 
11:45:14.000000000 +0200
+++ /work/SRC/openSUSE:Factory/.mariadb.new/mariadb.changes     2015-09-13 
09:42:19.000000000 +0200
@@ -1,0 +2,34 @@
+Fri Aug 28 14:38:45 UTC 2015 - [email protected]
+
+- update to MariaDB 10.0.21
+  * changes:
+    * https://mariadb.com/kb/en/mariadb/mariadb-10021-release-notes
+  * the following patches were processed upstream and are no longer needed:
+    * mariadb-5.5.28-hotcopy.patch
+    * mariadb-5.1.50-strncat-overflow.patch
+    * mysql-community-server-5.1.51-mysql_config.patch
+    * mariadb-5.5.32-upgrade-exit-status.patch
+    * mariadb-5.5.41-mariadb-admincrash.patch
+- use syntax in mysql-systemd-helper that is accepted by both mariadb 
+  and mysql [bnc#937767]
+- fix spurious macro expansion in comment in specfile
+- install INFO_BIN and INFO_SRC, noticed in MDEV-6912
+- replace readline-devel for readline5-devel (MDEV-6912) [bnc#902396]
+- use spec-cleaner
+- Tweak some cmake switches to enable more things
+  * WITH_ASAN=OFF adress sanitization
+    WITH_LIBWRAP=ON tcp wrappers
+    ENABLED_PROFILING=OFF profiling disable (for mysql)
+    ENABLE_DEBUG_SYNC=OFF debug testing sync disable (for mysql)
+    WITH_PIC=ON by default we want pic generated binaries (for mysql)
+- set cmake options for MariaDB Galera Cluster    
+- remove superfluous '--group' parameter from mysql-systemd-helper
+- make -devel package installable in the presence of LibreSSL
+- cleanup after the update-message if it was displayed
+- add 'exec' to mysql-systemd-helper to shutdown mysql/mariadb cleanly
+  [bnc#943096]
+- remove redundant entry from %{_tmpfilesdir}/mysql.conf. Using both
+  'x' and 'X' options is redundant and causes a warning message.
+  Leaving only the 'x' line fixes this problem. [bnc#942908]
+
+-------------------------------------------------------------------

Old:
----
  mariadb-10.0.20.tar.gz

New:
----
  mariadb-10.0.21.tar.gz

++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Other differences:
------------------
++++++ mariadb.spec ++++++
--- /var/tmp/diff_new_pack.WjFZ9A/_old  2015-09-13 09:42:21.000000000 +0200
+++ /var/tmp/diff_new_pack.WjFZ9A/_new  2015-09-13 09:42:21.000000000 +0200
@@ -27,13 +27,14 @@
 %define builtin_plugins partition,csv,heap,aria,pbxt,myisam,myisammrg,xtradb
 %define extra_provides mariadb_100
 %define with_mandatory_boost 0
+%define build_extras 0
 # _tmpfilesdir is not defined in systemd macros up to openSUSE 13.2
 %{!?_tmpfilesdir: %global _tmpfilesdir %{_libexecdir}/tmpfiles.d }
 # Remove when 13.1 is out of support scope
 %if ! %{defined _rundir}
 %define _rundir %{_localstatedir}/run
 %endif
-%if 0 > 0
+%if 0%{build_extras} > 0
 %define with_jemalloc 1
 %define with_oqgraph 1
 %define with_cassandra 1
@@ -43,7 +44,7 @@
 %define with_cassandra 0
 %endif
 Name:           mariadb
-Version:        10.0.20
+Version:        10.0.21
 Release:        0
 Summary:        Server part of %{pretty_name}
 License:        SUSE-GPL-2.0-with-FLOSS-exception
@@ -71,7 +72,6 @@
 BuildRequires:  gcc-c++
 BuildRequires:  libaio-devel
 BuildRequires:  libbz2-devel
-BuildRequires:  libedit-devel
 BuildRequires:  libevent-devel
 BuildRequires:  libtool
 BuildRequires:  libxml2-devel
@@ -80,29 +80,27 @@
 BuildRequires:  openssl-devel
 BuildRequires:  pam-devel
 BuildRequires:  pcre-devel
-BuildRequires:  pkgconfig
-BuildRequires:  procps
-BuildRequires:  pwdutils
-BuildRequires:  readline-devel
-BuildRequires:  sqlite
-BuildRequires:  tcpd-devel
-BuildRequires:  zlib-devel
-BuildRequires:  pkgconfig(systemd)
-# Tests requires time and ps and some perl modules
-# Keep in sync with Requires of mysql-testsuite
-BuildRequires:  procps
-BuildRequires:  time
+BuildRequires:  perl(Data::Dumper)
 BuildRequires:  perl(Env)
 BuildRequires:  perl(Exporter)
 BuildRequires:  perl(Fcntl)
 BuildRequires:  perl(File::Temp)
-BuildRequires:  perl(Data::Dumper)
 BuildRequires:  perl(Getopt::Long)
 BuildRequires:  perl(IPC::Open3)
 BuildRequires:  perl(Socket)
 BuildRequires:  perl(Sys::Hostname)
 BuildRequires:  perl(Test::More)
 BuildRequires:  perl(Time::HiRes)
+BuildRequires:  pkgconfig
+# Tests requires time and ps and some perl modules
+# Keep in sync with Requires of mysql-testsuite
+BuildRequires:  procps
+BuildRequires:  pwdutils
+BuildRequires:  sqlite
+BuildRequires:  tcpd-devel
+BuildRequires:  time
+BuildRequires:  zlib-devel
+BuildRequires:  pkgconfig(systemd)
 # required by rcmysql
 Requires:       %{name}-client
 Requires:       %{name}-errormessages = %{version}
@@ -129,6 +127,12 @@
 Obsoletes:      %{extra_provides}-debug-version < %{version}
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 %{?systemd_requires}
+# On mariadb we want readline5 and on mysql we use libedit from system
+%if "%{name}" == "mariadb"
+BuildRequires:  readline5-devel
+%else
+BuildRequires:  libedit-devel
+%endif
 %if 0%{with_mandatory_boost} > 0
 BuildRequires:  boost-devel >= 1.57.0
 %endif
@@ -163,7 +167,7 @@
 Requires:       glibc-devel
 Requires:       libmysqlclient%{soname} = %{version}
 Requires:       libmysqlclient_r%{soname} = %{version}
-Requires:       openssl-devel
+Requires:       pkgconfig(libssl)
 Requires:       zlib-devel
 # mysql-devel needs to be provided as some pkgs still depend on it
 Provides:       mysql-devel = %{version}
@@ -265,13 +269,11 @@
 Requires:       %{name}-client = %{version}
 Requires:       %{name}-tools = %{version}
 # Tests requires time and ps and some perl modules
-Requires:       procps
-Requires:       time
+Requires:       perl(Data::Dumper)
 Requires:       perl(Env)
 Requires:       perl(Exporter)
 Requires:       perl(Fcntl)
 Requires:       perl(File::Temp)
-Requires:       perl(Data::Dumper)
 Requires:       perl(Getopt::Long)
 Requires:       perl(IPC::Open3)
 Requires:       perl(Socket)
@@ -279,6 +281,8 @@
 Requires:       perl(Test::More)
 Requires:       perl(Time::HiRes)
 Requires:       perl-DBD-mysql
+Requires:       procps
+Requires:       time
 Conflicts:      otherproviders(mysql-test)
 Provides:       mysql-test = %{version}
 Provides:       %{extra_provides}-test = %{version}
@@ -351,11 +355,17 @@
 export CFLAGS="%{optflags} -DOPENSSL_LOAD_CONF -DPIC -fPIC 
-DFORCE_INIT_OF_VARS $EXTRA_FLAGS"
 export CXXFLAGS="$CFLAGS -felide-constructors"
 %cmake -DWITH_SSL=system                                             \
+        -DWITH_ASAN=OFF                                              \
+        -DWITH_LIBWRAP=ON                                            \
+        -DENABLED_PROFILING=OFF                                      \
+        -DENABLE_DEBUG_SYNC=OFF                                      \
+        -DWITH_PIC=ON                                                \
         -DWITH_ZLIB=system                                           \
         -DWITH_LIBEVENT=system                                       \
         -DWITH_JEMALLOC=auto                                         \
         -DWITH_READLINE=0                                            \
         -DWITH_LIBEDIT=0                                             \
+        -DWITH_EDITLINE=system                                       \
         -DINSTALL_LAYOUT=RPM                                         \
         -DMYSQL_UNIX_ADDR="%{_localstatedir}/run/mysql/mysql.sock"      \
         -DINSTALL_UNIX_ADDRDIR="%{_localstatedir}/run/mysql/mysql.sock" \
@@ -375,6 +385,8 @@
         -DWITH_CSV_STORAGE_ENGINE=1                                  \
         -DWITH_HANDLERSOCKET_STORAGE_ENGINE=1                        \
         -DWITH_EMBEDDED_SERVER=true                                  \
+        -DWITH_WSREP=ON                                              \
+        -DWITH_INNODB_DISALLOW_WRITES=1                              \
         -DCOMPILATION_COMMENT="openSUSE package"                     \
         -DDENABLE_DOWNLOADS=false                                    \
         -DINSTALL_PLUGINDIR_RPM="%{_lib}/mysql/plugin"               \
@@ -382,7 +394,8 @@
         -DINSTALL_SYSCONF2DIR="%{_sysconfdir}/my.cnf.d"              \
         -DCMAKE_C_FLAGS_RELWITHDEBINFO="$CFLAGS"                     \
         -DCMAKE_CXX_FLAGS_RELWITHDEBINFO="$CXXFLAGS"                 \
-        -DCMAKE_BUILD_TYPE=RelWithDebInfo -DINSTALL_SQLBENCHDIR=share \
+        -DCMAKE_BUILD_TYPE=RelWithDebInfo                            \
+        -DINSTALL_SQLBENCHDIR=share                                  \
         -DCMAKE_C_FLAGS="$CFLAGS"                                    \
         -DCMAKE_CXX_FLAGS="$CXXFLAGS"                                \
         -DCMAKE_EXE_LINKER_FLAGS="-Wl,--as-needed -pie -Wl,-z,relro,-z,now" \
@@ -433,6 +446,9 @@
 
 # Symbols from build to go into libdir
 install -m 644 build/sql/mysqld.sym %{buildroot}%{_libdir}/mysql/mysqld.sym
+# INFO_BIN and INFO_SRC binaries
+install -p -m 644 build/Docs/INFO_SRC %{buildroot}%{_libdir}/mysql/
+install -p -m 644 build/Docs/INFO_BIN %{buildroot}%{_libdir}/mysql/
 
 # Remove handler socket client
 rm -f %{buildroot}%{_libdir}/mysql/plugin/handlersocket.so
@@ -459,7 +475,7 @@
 
 filelist mysql mysqladmin mysqlcheck mysqldump mysqlimport mysqlshow 
mysql_config_editor >mysql-client.files
 # The dialog stuff is mariadb only
-if [ "`ls '%buildroot'%_libdir/mysql/plugin/dialog*.so 2> /dev/null`" ]; then
+if [ "`ls '%{buildroot}'%{_libdir}/mysql/plugin/dialog*.so 2> /dev/null`" ]; 
then
     echo '%%dir %%_libdir/mysql'               >> mysql-client.files
     echo '%%dir %%_libdir/mysql/plugin'        >> mysql-client.files
     echo '%%_libdir/mysql/plugin/dialog*.so'   >> mysql-client.files
@@ -531,8 +547,7 @@
 # bnc#852451
 mkdir -p %{buildroot}%{_tmpfilesdir}
 cat > %{buildroot}%{_tmpfilesdir}/mysql.conf <<EOF
-x /var/tmp/mysql.*
-X /var/tmp/mysql.*
+x %{_localstatedir}/tmp/mysql.*
 EOF
 
 # SuSEfirewall service description
@@ -611,6 +626,7 @@
     --max-test-fail=0 || :
 
 # client does not require server and needs the user too
+
 %pre client
 getent group mysql >/dev/null || groupadd -r mysql
 getent passwd mysql >/dev/null || useradd -r -o -g mysql -u 60 -c "MySQL 
database admin" \
@@ -628,8 +644,8 @@
 
 %post
 %service_add_post mysql.service [email protected] mysql.target 
[email protected]
-# Use %tmpfiles_create when 13.2 is oldest in support scope
-/usr/bin/systemd-tmpfiles --create %{_tmpfilesdir}/mysql.conf || :
+# Use %%tmpfiles_create when 13.2 is oldest in support scope
+%{_bindir}/systemd-tmpfiles --create %{_tmpfilesdir}/mysql.conf || :
 
 # SLE11 Migration support
 for i in protected tmp; do
@@ -690,6 +706,8 @@
 
 %postun
 %service_del_postun mysql.service [email protected] mysql.target 
[email protected]
+# Remove the /var/adm updatemsg that was hand-created and thus not on filelist
+rm -f %{_localstatedir}/adm/update-messages/%{name}-%{version}-%{release}
 
 %post -n lib%{libname}%{soname} -p /sbin/ldconfig
 
@@ -727,6 +745,8 @@
 %{_datadir}/%{name}/*.sql
 %dir %{_libdir}/mysql
 %{_libdir}/mysql/mysqld.sym
+%{_libdir}/mysql/INFO_BIN
+%{_libdir}/mysql/INFO_SRC
 %config %{_sysconfdir}/sysconfig/SuSEfirewall2.d/services/mysql
 %dir %{_libdir}/mysql/plugin
 %{_libdir}/mysql/plugin/[!d]*.so

++++++ configuration-tweaks.tar.bz2 ++++++

++++++ mariadb-10.0.20.tar.gz -> mariadb-10.0.21.tar.gz ++++++
/work/SRC/openSUSE:Factory/mariadb/mariadb-10.0.20.tar.gz 
/work/SRC/openSUSE:Factory/.mariadb.new/mariadb-10.0.21.tar.gz differ: char 5, 
line 1

++++++ mysql-patches.tar.bz2 ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' 
old/mysql-patches/mysql-patches/mariadb-5.1.50-strncat-overflow.patch 
new/mysql-patches/mysql-patches/mariadb-5.1.50-strncat-overflow.patch
--- old/mysql-patches/mysql-patches/mariadb-5.1.50-strncat-overflow.patch       
2014-11-14 10:53:09.000000000 +0100
+++ new/mysql-patches/mysql-patches/mariadb-5.1.50-strncat-overflow.patch       
1970-01-01 01:00:00.000000000 +0100
@@ -1,20 +0,0 @@
-PATCH-P0-FIX-UPSTREAM: Fix possible buffer overflow
-
-strncat function is used with n not depending on current length of string we
-are appending to. Result might be buffer overflow.
-
-Maintainer: Michal Hrusecky <[email protected]>
-
-Index: mysys/mf_loadpath.c
-===================================================================
---- mysys/mf_loadpath.c.orig
-+++ mysys/mf_loadpath.c
-@@ -45,7 +45,7 @@ char * my_load_path(char * to, const cha
-     if (! my_getwd(buff,(uint) (FN_REFLEN-strlen(path)+is_cur),MYF(0)))
-     {
-       size_t length= strlen(buff);
--      (void) strmake(buff + length, path+is_cur, FN_REFLEN - length);
-+      (void) strmake(buff + length, path+is_cur, FN_REFLEN - strlen(buff) - 
length);
-     }
-     else
-       from= path;                           /* Return org file name */
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' 
old/mysql-patches/mysql-patches/mariadb-5.5.28-hotcopy.patch 
new/mysql-patches/mysql-patches/mariadb-5.5.28-hotcopy.patch
--- old/mysql-patches/mysql-patches/mariadb-5.5.28-hotcopy.patch        
2014-11-14 10:53:09.000000000 +0100
+++ new/mysql-patches/mysql-patches/mariadb-5.5.28-hotcopy.patch        
1970-01-01 01:00:00.000000000 +0100
@@ -1,38 +0,0 @@
-PATCH-P0-FIX-UPSTREAM: Makes hotcopy to ignores log tables
-BUGS: upstream#43594, bnc#525325
-
-If you are running hotcopy, you probably want to ignore all
-log tables.
-
-Maintainer: Michal Hrusecky <[email protected]>
-
-Index: scripts/mysqlhotcopy.sh
-===================================================================
---- scripts/mysqlhotcopy.sh.orig
-+++ scripts/mysqlhotcopy.sh
-@@ -843,7 +843,24 @@ sub get_list_of_tables {
-         } || [];
-     warn "Unable to retrieve list of tables in $db: $@" if $@;
- 
--    return (map { $_->[0] } @$tables);
-+    my @ignore_tables = ();
-+
-+    # Ignore tables for the mysql database
-+    if ($db eq 'mysql') {
-+        @ignore_tables = qw(general_log slow_log schema apply_status);
-+    }
-+
-+    my @res = ();
-+    if ($#ignore_tables > 1) {
-+       my @tmp = (map { $_->[0] } @$tables);
-+       for my $t (@tmp) {
-+           push(@res, $t) if not exists { map { $_=>1 } @ignore_tables 
}->{$t};
-+       }
-+    } else {
-+       @res = (map { $_->[0] } @$tables);
-+    }
-+
-+    return @res;
- }
- 
- sub get_list_of_views {
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' 
old/mysql-patches/mysql-patches/mariadb-5.5.32-upgrade-exit-status.patch 
new/mysql-patches/mysql-patches/mariadb-5.5.32-upgrade-exit-status.patch
--- old/mysql-patches/mysql-patches/mariadb-5.5.32-upgrade-exit-status.patch    
2014-11-14 10:53:09.000000000 +0100
+++ new/mysql-patches/mysql-patches/mariadb-5.5.32-upgrade-exit-status.patch    
1970-01-01 01:00:00.000000000 +0100
@@ -1,35 +0,0 @@
-PATCH-P0-FEATURE-SUSE: Returning 0 when already upgraded.
-
-Returning non-zero exit status in this case is not nice to scripts using
-mysql_upgrade (eg. our init script)
-
-Maintainer: Michal Hrusecky <[email protected]>
-
-Index: client/mysql_upgrade.c
-===================================================================
---- client/mysql_upgrade.c.orig
-+++ client/mysql_upgrade.c
-@@ -976,7 +976,9 @@ int main(int argc, char **argv)
-     printf("This installation of MySQL is already upgraded to %s, "
-            "use --force if you still need to run mysql_upgrade\n",
-            MYSQL_SERVER_VERSION);
--    die(NULL);
-+    free_used_memory();
-+    my_end(MY_CHECK_ERROR);
-+    exit(0);
-   }
- 
-   if (opt_version_check && check_version_match())
-Index: mysql-test/t/mysql_upgrade.test
-===================================================================
---- mysql-test/t/mysql_upgrade.test.orig
-+++ mysql-test/t/mysql_upgrade.test
-@@ -14,7 +14,7 @@ file_exists $MYSQLD_DATADIR/mysql_upgrad
- 
- --echo Run it again - should say already completed
- --replace_result $MYSQL_SERVER_VERSION VERSION
----error 1
-+--error 0
- --exec $MYSQL_UPGRADE 2>&1
- 
- # It should have created a file in the MySQL Servers datadir
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' 
old/mysql-patches/mysql-patches/mariadb-5.5.41-mariadb-admincrash.patch 
new/mysql-patches/mysql-patches/mariadb-5.5.41-mariadb-admincrash.patch
--- old/mysql-patches/mysql-patches/mariadb-5.5.41-mariadb-admincrash.patch     
2015-06-23 11:00:06.000000000 +0200
+++ new/mysql-patches/mysql-patches/mariadb-5.5.41-mariadb-admincrash.patch     
1970-01-01 01:00:00.000000000 +0100
@@ -1,27 +0,0 @@
-PATCH-P1-FIX-UPSTREAM: mysql admin crash
-BUGS: rhbz#1207041 upstream#7883
-
-mysqladmin crash on execution of below command:
-
-  #> mysqladmin -u root -p
-  ...
-  Segmentation fault (core dumped)
-
-This is probably caused by memory corruption based on working with 
temp_argv[-1].
-
-RHBZ: #1207041
-Upstream report: https://mariadb.atlassian.net/browse/MDEV-7883
-
-diff -up mariadb-5.5.41/client/mysqladmin.cc.bz1207041 
mariadb-5.5.41/client/mysqladmin.cc
---- mariadb-5.5.41/client/mysqladmin.cc.bz1207041      2015-03-30 
12:37:31.078880914 +0200
-+++ mariadb-5.5.41/client/mysqladmin.cc        2015-03-30 13:03:32.442152833 
+0200
-@@ -1215,7 +1215,8 @@ static char **mask_password(int argc, ch
-      }
-     argc--;
-   }
--  temp_argv[argc]= my_strdup((*argv)[argc], MYF(MY_FAE));
-+  if (argc >= 0)
-+    temp_argv[argc]= my_strdup((*argv)[argc], MYF(MY_FAE));
-   return(temp_argv);
- }
- 
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' 
old/mysql-patches/mysql-patches/mysql-community-server-5.1.51-mysql_config.patch
 
new/mysql-patches/mysql-patches/mysql-community-server-5.1.51-mysql_config.patch
--- 
old/mysql-patches/mysql-patches/mysql-community-server-5.1.51-mysql_config.patch
    2014-11-14 10:53:09.000000000 +0100
+++ 
new/mysql-patches/mysql-patches/mysql-community-server-5.1.51-mysql_config.patch
    1970-01-01 01:00:00.000000000 +0100
@@ -1,18 +0,0 @@
-PATCH-P0-FIX-UPSTREAM: Fix linking options
-BUGS: upstream#39175, bnc#420313
-
-Maintainer: Michal Hrusecky <[email protected]>
-
-Index: scripts/mysql_config.sh
-===================================================================
---- scripts/mysql_config.sh.orig
-+++ scripts/mysql_config.sh
-@@ -94,7 +94,7 @@ fix_path pkgincludedir include/mysql inc
- 
- version='@VERSION@'
- socket='@MYSQL_UNIX_ADDR@'
--ldflags='@LDFLAGS@'
-+ldflags='@SAVE_LDFLAGS@'
- 
- if [ @MYSQL_TCP_PORT_DEFAULT@ -eq 0 ]; then
-   port=0

++++++ mysql-systemd-helper ++++++
--- /var/tmp/diff_new_pack.WjFZ9A/_old  2015-09-13 09:42:21.000000000 +0200
+++ /var/tmp/diff_new_pack.WjFZ9A/_new  2015-09-13 09:42:21.000000000 +0200
@@ -20,10 +20,10 @@
 
        # Read options - important for multi setup
        if [[ -n "$INSTANCE" && "x$INSTANCE" != "xdefault" ]]; then
-               opts="$(/usr/bin/my_print_defaults --mysqld mysqld_multi 
"$INSTANCE")"
+               opts="$(/usr/bin/my_print_defaults mysqld mysqld_multi 
"$INSTANCE")"
                tmp_opts="$opts"
        else
-               opts="$(/usr/bin/my_print_defaults --mysqld)"
+               opts="$(/usr/bin/my_print_defaults mysqld)"
                tmp_opts="$opts"
        fi
 
@@ -34,7 +34,6 @@
                        --socket=*)    socket="$(echo "$arg"             | sed 
-e 's/^[^=]*=//')" ;;
                        --datadir=*)   datadir="$(echo "$arg"            | sed 
-e 's/^[^=]*=//')" ;;
                        --user=*)      mysql_daemon_user="$(echo "$arg"  | sed 
-e 's/^[^=]*=//')" ;;
-                       --group=*)     mysql_daemon_group="$(echo "$arg" | sed 
-e 's/^[^=]*=//')" ;;
                esac
        done
 }
@@ -88,7 +87,7 @@
                # Run protected MySQL accessible only though socket in our 
directory
                echo "Running protected MySQL... "
                /usr/sbin/mysqld \
-                       --user="$mysql_daemon_user" 
--group="$mysql_daemon_group" \
+                       --user="$mysql_daemon_user" \
                        $opts \
                        --skip-networking \
                        --skip-grant-tables \
@@ -145,7 +144,7 @@
 }
 
 mysql_start() {
-       /usr/sbin/mysqld --user="$mysql_daemon_user" 
--group="$mysql_daemon_group" $opts 
+       exec /usr/sbin/mysqld --user="$mysql_daemon_user" $opts 
 }
 
 # We rely on output in english at some points

++++++ series ++++++
--- /var/tmp/diff_new_pack.WjFZ9A/_old  2015-09-13 09:42:21.000000000 +0200
+++ /var/tmp/diff_new_pack.WjFZ9A/_new  2015-09-13 09:42:21.000000000 +0200
@@ -1,11 +1,7 @@
-mariadb-5.5.28-hotcopy.patch
 mysql-community-server-5.1.45-multi-configuration.patch
 mysql-community-server-5.1.46-logrotate.patch
-mariadb-5.1.50-strncat-overflow.patch
 mariadb-5.5.28-install_db-quiet.patch
-mysql-community-server-5.1.51-mysql_config.patch
 mariadb-10.0.15-mysqld_multi-features.patch
-mariadb-5.5.32-upgrade-exit-status.patch
 mariadb-5.2.3-cnf.patch
 mysql-community-server-5.5.6-safe-process-in-bin.patch
 mariadb-10.0.17-group.patch
@@ -14,7 +10,6 @@
 mariadb-10.0.16-header_files_const_warnings.patch
 mariadb-10.0.15-fortify-and-O.patch
 mariadb-10.0.15-logrotate-su.patch
-mariadb-5.5.41-mariadb-admincrash.patch
 mariadb-10.0.15-covscan-signexpr.patch
 mariadb-10.0.10-string-overflow.patch
 mariadb-10.0.20-tabxml-bufferoverflowstrncat.patch


Reply via email to