Hello community,
here is the log from the commit of package mariadb for openSUSE:Factory checked in at 2015-04-27 22:07: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 2014-11-18 22:55:59.000000000 +0100
+++ /work/SRC/openSUSE:Factory/.mariadb.new/mariadb.changes 2015-04-27 22:07:20.000000000 +0200
@@ -1,0 +2,55 @@
+Tue Apr 14 13:42:54 UTC 2015 - michal.hrusecky@opensuse.org
+
+- fix parent directory has insecure permissions error
+
+-------------------------------------------------------------------
+Tue Apr 14 08:20:47 UTC 2015 - michal.hrusecky@opensuse.org
+
+- disable optional features for mariadb
+ * still possible to use them from mariadb_100 package
+
+-------------------------------------------------------------------
+Mon Mar 23 23:24:11 UTC 2015 - dvaleev@suse.com
+
+- Adjust _constraints. 11GB is not enough for ppc64 builds,
+ increase to 13GB
+
+-------------------------------------------------------------------
+Tue Mar 3 05:48:08 UTC 2015 - michal.hrusecky@opensuse.org
+
+- Updated to the version 10.0.17
+ * Release notes:
+ http://kb.askmonty.org/v/mariadb-10017-release-notes
+ * Changelog:
+ http://kb.askmonty.org/v/mariadb-10017-changelog
+- merged patches to packaging git and regenerated
+ * few fixes mainly to upgrades
+
+-------------------------------------------------------------------
+Mon Mar 2 17:25:47 UTC 2015 - mgorse@suse.com
+
+- README.SuSE is now README.SUSE; fix name in some places.
+
+-------------------------------------------------------------------
+Fri Jan 23 19:17:09 UTC 2015 - xrigou@otenet.gr
+
+- Fix undefined initial status in systemd script (boo #914370)
+
+-------------------------------------------------------------------
+Mon Jan 12 20:29:24 UTC 2015 - xrigou@otenet.gr
+
+- Fix include dir in alternative cnf files (bnc #859345)
+
+-------------------------------------------------------------------
+Sat Dec 6 11:44:25 UTC 2014 - michal.hrusecky@opensuse.org
+
+- run spec cleaner on spec
+- update to 10.0.15
+ * Release notes:
+ http://kb.askmonty.org/v/mariadb-10015-release-notes
+ * Changelog:
+ http://kb.askmonty.org/v/mariadb-10015-changelog
+- conditionally enable more storage engines
+- updated packaging to the latest templates
+
+-------------------------------------------------------------------
Old:
----
mariadb-10.0.14.tar.bz2
New:
----
mariadb-10.0.17.tar.gz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ mariadb.spec ++++++
++++ 751 lines (skipped)
++++ between /work/SRC/openSUSE:Factory/mariadb/mariadb.spec
++++ and /work/SRC/openSUSE:Factory/.mariadb.new/mariadb.spec
++++++ README.debug ++++++
--- /var/tmp/diff_new_pack.y5VfTY/_old 2015-04-27 22:07:23.000000000 +0200
+++ /var/tmp/diff_new_pack.y5VfTY/_new 2015-04-27 22:07:23.000000000 +0200
@@ -1,7 +1,7 @@
Debugging mysqld crashes
========================
Author: Michal Marek
-Last modified: 2006-07-31
+Last modified: 2014-11-21
Contents
--------
@@ -67,22 +67,16 @@
gdb /usr/sbin/mysqld /var/lib/mysql/core
(gdb) bt
-Replace mysqld with the mysqld version you used (mysqld, mysqld-max or
-mysqld-debug) and core with the actual name of the coredump.
+Replace mysqld with the mysqld version you used (mysqld, mysqld-max)
+and core with the actual name of the coredump.
3) Trace files
--------------
-You'll need the mysqld-debug binary from the mysql-debug package to get
-a trace file. Install the mysqld-debug package and the start mysqld
-using following command:
+Start mysqld using following command:
$ MYSQLD_DEBUG=yes rcmysql start
- Note: The init script doesn't automatically pick up the mysqld-debug
- binary (as it does with mysqld-max), because it is expected to be used
- just temporarily to help solving a particular problem.
-
-The init script will then start mysqld-debug and add the --core-file,
+The init script will then start mysqld and add the --core-file,
--log and --debug options for you. The query log will be stored in
/var/lib/mysql/myqld-query.log
@@ -92,9 +86,7 @@
/var/lib/mysql/mysqld.trace
If you don't like the options set by the init script, just put your own
-into /etc/my.cnf and the init script will honor it. For information
-about the --debug option, see "The DBUG Package":
-http://dev.mysql.com/doc/refman/5.0/en/the-dbug-package.html .
+into /etc/my.cnf and the init script will honor them.
The trace file will contain various debug information and function
calls/returns and will become _extremly_ huge after a while, so don't
++++++ README.install ++++++
--- /var/tmp/diff_new_pack.y5VfTY/_old 2015-04-27 22:07:23.000000000 +0200
+++ /var/tmp/diff_new_pack.y5VfTY/_new 2015-04-27 22:07:23.000000000 +0200
@@ -15,6 +15,6 @@
'/usr/bin/mysql_secure_installation'
which will also give you the option of removing the test
-databases and anonymous user created by default. This is
+databases and anonymous user created by default. This is
strongly recommended for production servers.
++++++ _constraints ++++++
--- /var/tmp/diff_new_pack.y5VfTY/_old 2015-04-27 22:07:23.000000000 +0200
+++ /var/tmp/diff_new_pack.y5VfTY/_new 2015-04-27 22:07:23.000000000 +0200
@@ -1,7 +1,7 @@
<constraints>
<hardware>
<disk>
- <size unit="G">9</size>
+ <size unit="G">13</size>
</disk>
</hardware>
</constraints>
++++++ build.inc ++++++
--- /var/tmp/diff_new_pack.y5VfTY/_old 2015-04-27 22:07:23.000000000 +0200
+++ /var/tmp/diff_new_pack.y5VfTY/_new 2015-04-27 22:07:23.000000000 +0200
@@ -1,130 +1,49 @@
-%if 0%{?suse_version} < 1120 && 0%{?suse_version} > 0
-%define socketpath /var/lib/mysql
-%else
-%define socketpath /var/run/mysql
-%endif
-%if 0%{?suse_version} > 1140
-export EXTRA_FLAGS=" -Wno-unused-but-set-variable -fno-strict-aliasing -Wno-unused-parameter "
-%endif
+EXTRA_FLAGS="-Wno-unused-but-set-variable -fno-strict-aliasing -Wno-unused-parameter"
+# Mariadb devs seems to fall in love with -Werror option
+EXTRA_FLAGS="${EXTRA_FLAGS} -Wno-error"
%ifarch ppc64
-export EXTRA_FLAGS=" -mminimal-toc "
-%endif
-export CFLAGS="$RPM_OPT_FLAGS -DOPENSSL_LOAD_CONF -DPIC -fPIC -DFORCE_INIT_OF_VARS $EXTRA_FLAGS "
-export CXXFLAGS="$CFLAGS"
-
-%if 0%{use_cmake} < 1
-autoreconf -f -i
-# Make the compile a function, since we do multiple builds
-BuildMySQL() {
- # The --enable-assembler simply does nothing on systems that do not
- # support assembler speedups.
- suffix="$1"; shift
- mkdir _build$suffix
- pushd _build$suffix
- ../configure \
- --enable-assembler \
- --with-readline \
- --infodir=%{_infodir} \
- --libdir=%{_libdir} \
- --libexecdir=/usr/sbin \
- --localstatedir=/var/lib/mysql \
- --mandir=%{_mandir} \
- --prefix=%{_prefix} \
- --sysconfdir=/etc \
- --with-mysqld-user=mysql \
- --with-mysqld-group=mysql \
- --without-debug \
- --datadir=/usr/share \
- --includedir=/usr/include \
- --with-charset=utf8 \
- --with-collation=utf8_unicode_ci \
- --with-extra-charsets=all \
- --with-unix-socket-path=%{socketpath}/mysql.sock \
- --enable-thread-safe-client \
- --with-comment="SUSE MySQL RPM" \
- --with-libwrap \
- --with-server-suffix=$suffix \
-%ifarch s390 s390x
- --with-atomic-ops=rwlocks \
-%else
- --with-atomic-ops=smp \
-%endif
- --with-ssl=/usr \
- --with-plugins=%{builtin_plugins} \
- --without-plugin-handlersocket \
- HOSTNAME="/bin/hostname -f" \
- "$@"
- # Add this for MyISAM RAID support:
- # --with-raid
- # benchdir does not fit in above model. Fix when we make a separate package
- make %{?jobs:-j%jobs}
- nm --numeric-sort sql/mysqld > sql/mysqld.sym
- # needed for make check, which is not VPATH aware
- # copy the files unconditionally so that manual 'make check' after
- # the build works, too
- cp -a ../mysql-test/* mysql-test/
- for i in ../sql/share/{english,charsets}; do
- [ -d $i ] && cp -a $i sql/share/
- done
- cp -a ../scripts/*.sql scripts/
-%if %{?_with_testsuite:1}0
- pushd mysql-test; perl ./mysql-test-run.pl --force; popd
-%endif
- popd
-}
-# Build the client, extra tools, libraries
-%if 0%{?preferred} > 0
-BuildMySQL "" --with-embedded-server
-%else
-BuildMySQL "" --without-embedded-server
-%endif
-# build mysqld-debug
-BuildMySQL "-debug" --with-debug --without-embedded-server
-
-%if 0%{?preferred} > 0
-mkdir -p _buildlibmysqld/tmp
-cd _buildlibmysqld/tmp
-ar -x ../../_build/libmysqld/libmysqld.a
-gcc $CFLAGS $LDFLAGS -shared -Wl,-soname,libmysqld.so.0 -o ../libmysqld.so.0.0.1 \
-*.o \
--lpthread -lcrypt -lnsl -lssl -lcrypto -lz -lrt -lstdc++ -lm -lc
-cd ..
-rm -rf tmp
-cd ..
-%endif
-
-%else # cmake build
-
-BuildMySQL() {
- mkdir _build$1
- pushd _build$1
- shift
- cmake -DWITH_SSL=system \
- -DWITH_ZLIB=system \
- -DWITH_LIBEVENT=system \
- -DWITH_JEMALLOC=no \
- -DWITH_READLINE=0 \
- -DWITH_LIBEDIT=0 \
- -DINSTALL_LAYOUT=RPM \
- -DMYSQL_UNIX_ADDR=%{socketpath}/mysql.sock \
- -DINSTALL_MYSQLSHAREDIR=share/%{name} \
- -DWITH_COMMENT="openSUSE MySQL rpm" \
- -DWITH_EXTRA_CHARSET=all \
- -DDEFAULT_CHARSET=utf8 -DDEFAULT_COLLATION=utf8_general_ci \
- -DWITH_INNOBASE_STORAGE_ENGINE=1 \
- -DWITH_PERFSCHEMA_STORAGE_ENGINE=1 \
- -DWITH_EMBEDDED_SERVER=true \
- -DCOMPILATION_COMMENT="openSUSE package" \
- -DDENABLE_DOWNLOADS=false \
- -DINSTALL_PLUGINDIR_RPM="%{_lib}/mysql/plugin" \
- -DINSTALL_LIBDIR_RPM="%{_lib}" \
- -Wno-dev "$@" ..
- make %{?jobs:-j%jobs}
- nm --numeric-sort sql/mysqld > sql/mysqld.sym
- popd
-}
-
-BuildMySQL "" -DCMAKE_BUILD_TYPE=Release -DINSTALL_SQLBENCHDIR=share
-# TokuDB can't be compiled without optimisations turned on
-BuildMySQL "-debug" -DCMAKE_BUILD_TYPE=Debug -DWITHOUT_TOKUDB=1
+EXTRA_FLAGS="${EXTRA_FLAGS} -mminimal-toc"
%endif
+export CFLAGS="%{optflags} -DOPENSSL_LOAD_CONF -DPIC -fPIC -DFORCE_INIT_OF_VARS $EXTRA_FLAGS"
+export CXXFLAGS="$CFLAGS -felide-constructors"
+%cmake -DWITH_SSL=system \
+ -DWITH_ZLIB=system \
+ -DWITH_LIBEVENT=system \
+ -DWITH_JEMALLOC=auto \
+ -DWITH_READLINE=0 \
+ -DWITH_LIBEDIT=0 \
+ -DINSTALL_LAYOUT=RPM \
+ -DMYSQL_UNIX_ADDR="%{_localstatedir}/run/mysql/mysql.sock" \
+ -DINSTALL_UNIX_ADDRDIR="%{_localstatedir}/run/mysql/mysql.sock" \
+ -DINSTALL_MYSQLSHAREDIR=share/%{name} \
+ -DWITH_COMMENT="openSUSE MySQL rpm" \
+ -DWITH_EXTRA_CHARSET=all \
+ -DDEFAULT_CHARSET=utf8 -DDEFAULT_COLLATION=utf8_general_ci \
+ -DWITH_INNOBASE_STORAGE_ENGINE=1 \
+ -DWITH_PERFSCHEMA_STORAGE_ENGINE=1 \
+%if 0%{with_oqgraph} > 0
+ -DWITH_OQGRAPH_STORAGE_ENGINE=1 \
+%endif
+%if 0%{with_cassandra} > 0
+ -DWITH_CASSANDRA_STORAGE_ENGINE=1 \
+%endif
+ -DWITH_XTRADB_STORAGE_ENGINE=1 \
+ -DWITH_CSV_STORAGE_ENGINE=1 \
+ -DWITH_HANDLERSOCKET_STORAGE_ENGINE=1 \
+ -DWITH_EMBEDDED_SERVER=true \
+ -DCOMPILATION_COMMENT="openSUSE package" \
+ -DDENABLE_DOWNLOADS=false \
+ -DINSTALL_PLUGINDIR_RPM="%{_lib}/mysql/plugin" \
+ -DINSTALL_LIBDIR_RPM="%{_lib}" \
+ -DINSTALL_SYSCONF2DIR="%{_sysconfdir}/my.cnf.d" \
+ -DCMAKE_C_FLAGS_RELWITHDEBINFO="$CFLAGS" \
+ -DCMAKE_CXX_FLAGS_RELWITHDEBINFO="$CXXFLAGS" \
+ -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" \
+ -DCMAKE_MODULE_LINKER_FLAGS="-Wl,--as-needed -pie -Wl,-z,relro,-z,now" \
+ -DCMAKE_SHARED_LINKER_FLAGS="-Wl,--as-needed -pie -Wl,-z,relro,-z,now" \
+ -Wno-dev "$@" ..
+make %{?_smp_mflags}
+nm --numeric-sort sql/mysqld > sql/mysqld.sym
++++++ configuration-tweaks.tar.bz2 ++++++
++++++ install.inc ++++++
--- /var/tmp/diff_new_pack.y5VfTY/_old 2015-04-27 22:07:23.000000000 +0200
+++ /var/tmp/diff_new_pack.y5VfTY/_new 2015-04-27 22:07:23.000000000 +0200
@@ -1,11 +1,5 @@
-# install the debug server first, so that we don't overwrite the standard
-mkdir -p %buildroot%_libdir/mysql
-make -C _build-debug/sql install DESTDIR=%buildroot
-mv %buildroot/usr/sbin/mysqld %buildroot/usr/sbin/mysqld-debug
-install -m 644 _build-debug/sql/mysqld.sym %buildroot%_libdir/mysql/mysqld-debug.sym
-# install the client, extra tools, libraries and the standard server
-make -C _build install DESTDIR=%buildroot benchdir_root=/usr/share/
-install -m 644 _build/sql/mysqld.sym %buildroot%_libdir/mysql/mysqld.sym
+%cmake_install benchdir_root=/usr/share/
+install -m 644 build/sql/mysqld.sym %buildroot%_libdir/mysql/mysqld.sym
# remove handler socket client
rm -f %buildroot%_libdir/libhsclient*
rm -f %buildroot%_bindir/hsclient*
@@ -17,6 +11,7 @@
[ \! -f "%buildroot%_libdir/"libmysqld.static ] || mv "%buildroot%_libdir/"libmysqld.static "%buildroot%_libdir/"libmysqld.a
rm -f %buildroot%_libdir/mysql/{,plugin}/*.{a,la}
rm -f %buildroot%_libdir/mysql/libndbclient.*
+rm -f %buildroot%_libdir/mysql/plugin/debug_key_management.so
rm -f %{buildroot}/usr/share/mysql-test/{mysql-test-run,mtr}
rm -f %{buildroot}/usr/share/mysql/{binary-configure,errmsg-utf8.txt,magic,mysql-log-rotate,mysql*.server}
rm -f %{buildroot}%{_libdir}/mysql/plugin/daemon_example.ini
@@ -35,20 +30,26 @@
if test -e usr/bin/"$i"; then
echo /usr/bin/"$i"
fi
+ if test -d usr/share/*/"$i"; then
+ echo "/`echo usr/share/*/"$i"`"
+ fi
+ if test -n "`ls -1 %buildroot$i 2> /dev/null`"; then
+ echo "$i"
+ fi
if ls usr/share/man/*/"$i".[1-9]* >/dev/null 2>&1; then
echo "%%doc %_mandir/*/$i.[1-9]*"
fi
done
popd >/dev/null
}
-filelist innochecksum my_print_defaults myisam_ftdump myisamchk myisamlog myisampack mysql_fix_extensions mysql_fix_privilege_tables mysql_install_db mysql_secure_installation mysql_upgrade mysqlbug mysqld mysqld_multi mysqld_safe mysqlbinlog mysqldumpslow mysqlmanager resolve_stack_dump resolveip {m,}aria_chk {m,}aria_dump_log {m,}aria_ftdump {m,}aria_pack {m,}aria_read_log xtstat tokuftdump >mysql.files
+filelist innochecksum my_print_defaults myisam_ftdump myisamchk myisamlog myisampack mysql_fix_extensions mysql_fix_privilege_tables mysql_install_db mysql_secure_installation mysql_upgrade mysqlbug mysqld mysqld_multi mysqld_safe mysqlbinlog mysqldumpslow mysqlmanager mroonga resolve_stack_dump resolveip {m,}aria_chk {m,}aria_dump_log {m,}aria_ftdump {m,}aria_pack {m,}aria_read_log xtstat tokuftdump >mysql.files
filelist mysql mysqladmin mysqlcheck mysqldump mysqlimport mysqlshow mysql_config_editor >mysql-client.files
-filelist mysql_config >libmysqlclient-devel.files
+filelist mysql_config /usr/share/pkgconfig/mariadb.pc >libmysqlclient-devel.files
filelist mysqlslap >mysql-bench.files
filelist mysql_client_test mysql_client_test_embedded mysql_waitpid mysqltest mysqltest_embedded >mysql-test.files
# all binaries that don't need to be in a "default" install (mysql.rpm +
# mysql-client.rpm)
-filelist msql2mysql mysql_plugin mysql_convert_table_format mysql_find_rows mysql_setpermission mysql_tzinfo_to_sql mysql_zap mysqlaccess mysqlhotcopy perror replace mysql_embedded %{name}_mytop hsclient >mysql-tools.files
+filelist msql2mysql mysql_plugin mysql_convert_table_format mysql_find_rows mysql_setpermission mysql_tzinfo_to_sql mysql_zap mysqlaccess mysqlhotcopy perror replace mysql_embedded %{name}_mytop hsclient %{_bindir}/wsrep* /usr/share/mysql/wsrep_notify >mysql-tools.files
filelist ndbd ndbmtd ndbd_redo_log_reader >mysql-ndb-storage.files
filelist ndb_mgmd >mysql-ndb-management.files
filelist ndb_{config,desc,error_reporter,mgm,print_backup_file,print_schema_file,print_sys_file,restore,select_all,select_count,show_tables,size.pl,test_platform,waiter} >mysql-ndb-tools.files
@@ -71,35 +72,22 @@
errmsg_list > errormessages.files
### files not installed by make install
# Create directory structure
-DOCS=(COPYING README EXCEPTIONS-CLIENT %_sourcedir/README.debug %_sourcedir/README.SuSE plugin/daemon_example/daemon_example.ini)
+DOCS=(COPYING README EXCEPTIONS-CLIENT %_sourcedir/README.debug %_sourcedir/README.SUSE plugin/daemon_example/daemon_example.ini)
DOCDIR=%buildroot%_defaultdocdir/%name
install -d -m 755 ${DOCDIR}
install -d -m 755 %buildroot/etc/logrotate.d
-install -m 644 _build/support-files/mysql-log-rotate %buildroot/etc/logrotate.d/mysql
-%if 0%{?preferred} > 0%{?use_cmake}
-install -m 644 _buildlibmysqld/*.so* %buildroot%_libdir
-ln -s libmysqld.so.0.0.1 %buildroot%_libdir/libmysqld.so.0
-ln -s libmysqld.so.0.0.1 %buildroot%_libdir/libmysqld.so
-%endif
+install -m 644 build/support-files/mysql-log-rotate %buildroot/etc/logrotate.d/mysql
install -m 660 %{S:14} %buildroot/etc/my.cnf
[ \! -f scripts/mysqlaccess.conf ] || install -m 640 scripts/mysqlaccess.conf %buildroot/etc/mysqlaccess.conf
for i in "${DOCS[@]}"; do
install -m 644 "${i}" "${DOCDIR}" || true
done
-%if 0%{?use_systemd} > 0
install -D -m 755 %_sourcedir/rc.mysql.systemd '%buildroot'/usr/lib/mysql/rcmysql
sed -i 's|@MYSQLVER@|%{version}|' '%buildroot'/usr/lib/mysql/rcmysql
ln -sf service '%buildroot'/usr/sbin/rcmysql
install -D -m 644 %_sourcedir/mysql.service '%buildroot'/usr/lib/systemd/system/mysql.service
sed -i 's|doc/packages/mysql|doc/packages/%{name}|g' '%buildroot'/usr/lib/mysql/rcmysql
rm -rf '%buildroot'/etc/init.d
-%else
-install -d -m 755 '%buildroot'/etc/init.d
-install -m 755 '%_sourcedir'/rc.mysql.sysvinit '%buildroot'/etc/init.d/mysql
-sed -i 's|@MYSQLVER@|%{version}|' '%buildroot'/etc/init.d/mysql
-ln -sf ../../etc/init.d/mysql '%buildroot'/usr/sbin/rcmysql
-sed -i 's|doc/packages/mysql|doc/packages/%{name}|g' '%buildroot'/etc/init.d/mysql
-%endif
# SuSEfirewall service description
install -D -m 644 %_sourcedir/mysql.SuSEfirewall2 \
%buildroot/etc/sysconfig/SuSEfirewall2.d/services/mysql
@@ -109,26 +97,14 @@
mkdir '%buildroot'/usr/share/mysql-test/var
# Final fixes
find '%buildroot'/usr/share/mysql-test -name '*.orig' -delete
-%if 0%{?suse_version} > 1030
%fdupes -s '%buildroot'/usr/share/mysql-test
-%endif
-%if 0%{?fedora_version} > 8
fdupes -q -n -r '%buildroot'/usr/share/mysql-test
-%endif
dos2unixConversion() {
%{__sed} -i 's/\r//g' "$1"
}
for i in `grep -Rl '\r' '%buildroot'/usr/share/sql-bench`; do
dos2unixConversion "$i"
done
-%if ! 0%{cluster} > 0
-cat mysql-ndb-storage.files mysql-ndb-management.files \
- mysql-ndb-tools.files mysql-ndb-extra.files | \
- sed 's|^%%doc\ ||' | while read tmp; do
- cd '%buildroot'
- rm -f .$tmp
-done
-%endif
%if ! 0%{preferred} > 0
cat libmysqlclient-devel.files | sed 's|%%doc\ ||' | while read tmp; do
cd '%buildroot'
@@ -143,10 +119,6 @@
ln -s mysqlcheck '%buildroot'%_bindir/mysqlrepair
ln -s mysqlcheck '%buildroot'%_bindir/mysqlanalyze
ln -s mysqlcheck '%buildroot'%_bindir/mysqloptimize
-%if 0%{?cluster} > 1
-ln -s libndbclient.so.6.0.0 '%buildroot'%_libdir/libndbclient.so.6.0
-ln -s libndbclient.so.6.0.0 '%buildroot'%_libdir/libndbclient.so.6
-%endif
if [ -f '%buildroot'/usr/bin/mysqlaccess.conf ]; then
mv '%buildroot'/usr/bin/mysqlaccess.conf '%buildroot'/etc/mysqlaccess.conf
fi
++++++ mysql-patches.tar.bz2 ++++++
++++ 2283 lines of diff (skipped)
++++++ rc.mysql.systemd ++++++
--- /var/tmp/diff_new_pack.y5VfTY/_old 2015-04-27 22:07:23.000000000 +0200
+++ /var/tmp/diff_new_pack.y5VfTY/_new 2015-04-27 22:07:23.000000000 +0200
@@ -32,6 +32,10 @@
# rc_reset clear local rc status (overall remains)
# rc_exit exit appropriate to overall rc status
+_rc_status_ret=0
+_rc_status=$_rc_status_ret
+_rc_status_all=$_rc_status
+
rc_check ()
{
_rc_status_ret=$?
@@ -301,9 +305,9 @@
unset MYSQLD
# use mysqld-debug only if explicitly requested (TODO: sysconfig variable?)
- if test "$MYSQLD_DEBUG" = yes -a -x /usr/sbin/mysqld-debug
+ if test "$MYSQLD_DEBUG" = yes -a -x /usr/sbin/mysqld
then
- MYSQLD=/usr/sbin/mysqld-debug
+ MYSQLD=/usr/sbin/mysqld
elif test -x /usr/sbin/mysqld-max
then
MYSQLD=/usr/sbin/mysqld-max
@@ -422,27 +426,12 @@
# Run mysql_upgrade on every package install/upgrade. Not always
# necessary, but doesn't do any harm. On big upgrade, require
# user confirmation.
- if [ -f "/var/lib/mysql/.run-mysql_upgrade" ]; then
- if [ \! -f "/var/lib/mysql/.force_upgrade" ] && \
- [ -f "$datadir/mysql_upgrade_info" ] && \
- [ -z "`grep "^$MYSQLVER" "$datadir/mysql_upgrade_info" 2> /dev/null`" ]; then
- echo
- echo "You are upgrading from different stable version of MySQL!"
- echo "Make sure you to make backup of your data (mostly $datadir)!"
- echo
- echo "If you want to continue upgrading your database, run following commands:"
- echo
- echo " touch /var/lib/mysql/.force_upgrade"
- echo " rcmysql restart"
- echo
- rc_failed; rc_status -v; rc_exit
-
- fi
+ if [ -f "$datadir/.run-mysql_upgrade" ]; then
echo > "$log_upgrade"
echo "`LANG="" date` - upgrading MySQL..." >> "$log_upgrade"
echo >> "$log_upgrade"
echo "Will update MySQL now, if you encounter any problems, please read following file:" | tee -a "$log_upgrade"
- echo " /usr/share/doc/packages/mysql/README.SuSE" | tee -a "$log_upgrade"
+ echo " /usr/share/doc/packages/mysql/README.SUSE" | tee -a "$log_upgrade"
sed -i -e 's|^\([[:blank:]]*\)skip-locking|\1skip-external-locking|' \
-e 's|^\([[:blank:]]*skip-federated\)|#\1|' /etc/my.cnf
[ -d /etc/mysql ] || \
@@ -502,8 +491,7 @@
}
echo "Running protected MySQL... " | tee -a "$log_upgrade"
- $SAFE_MYSQLD \
- --mysqld=${MYSQLD#/usr/sbin/} \
+ $MYSQLD \
$debug_flags \
--skip-networking \
--skip-grant-tables \
@@ -564,6 +552,8 @@
rm -f /var/lib/mysql/.run-mysql_upgrade
rm -f /var/lib/mysql/.force_upgrade
rm -f "$datadir"/{update-stamp-*,mysql/stamp-4.1} # used in the past
+ MYSQLVERSION="`mysqld --version 2> /dev/null | sed -n 's|mysqld[[:blank:]]\+Ver[[:blank:]]\+\([^[:blank:]]\+\)[[:blank:]].*|\1|p'`"
+ [ -z "$MYSQLVERSION" ] || echo "$MYSQLVERSION" > "$datadir"/mysql_upgrade_info
chown --no-dereference "$mysql_daemon_user:$mysql_daemon_group" "$log_upgrade"
chmod 640 "$log_upgrade"
fi
++++++ rc.mysql.sysvinit ++++++
--- /var/tmp/diff_new_pack.y5VfTY/_old 2015-04-27 22:07:23.000000000 +0200
+++ /var/tmp/diff_new_pack.y5VfTY/_new 2015-04-27 22:07:23.000000000 +0200
@@ -251,9 +251,9 @@
unset MYSQLD
# use mysqld-debug only if explicitly requested (TODO: sysconfig variable?)
- if test "$MYSQLD_DEBUG" = yes -a -x /usr/sbin/mysqld-debug
+ if test "$MYSQLD_DEBUG" = yes -a -x /usr/sbin/mysqld
then
- MYSQLD=/usr/sbin/mysqld-debug
+ MYSQLD=/usr/sbin/mysqld
elif test -x /usr/sbin/mysqld-max
then
MYSQLD=/usr/sbin/mysqld-max
@@ -372,27 +372,12 @@
# Run mysql_upgrade on every package install/upgrade. Not always
# necessary, but doesn't do any harm. On big upgrade, require
# user confirmation.
- if [ -f "/var/lib/mysql/.run-mysql_upgrade" ]; then
- if [ \! -f "/var/lib/mysql/.force_upgrade" ] && \
- [ -f "$datadir/mysql_upgrade_info" ] && \
- [ -z "`grep "^$MYSQLVER" "$datadir/mysql_upgrade_info" 2> /dev/null`" ]; then
- echo
- echo "You are upgrading from different stable version of MySQL!"
- echo "Make sure you to make backup of your data (mostly $datadir)!"
- echo
- echo "If you want to continue upgrading your database, run following commands:"
- echo
- echo " touch /var/lib/mysql/.force_upgrade"
- echo " rcmysql restart"
- echo
- rc_failed; rc_status -v; rc_exit
-
- fi
+ if [ -f "$datadir/.run-mysql_upgrade" ]; then
echo > "$log_upgrade"
echo "`LANG="" date` - upgrading MySQL..." >> "$log_upgrade"
echo >> "$log_upgrade"
echo "Will update MySQL now, if you encounter any problems, please read following file:" | tee -a "$log_upgrade"
- echo " /usr/share/doc/packages/mysql/README.SuSE" | tee -a "$log_upgrade"
+ echo " /usr/share/doc/packages/mysql/README.SUSE" | tee -a "$log_upgrade"
sed -i -e 's|^\([[:blank:]]*\)skip-locking|\1skip-external-locking|' \
-e 's|^\([[:blank:]]*skip-federated\)|#\1|' /etc/my.cnf
[ -d /etc/mysql ] || \
@@ -452,8 +437,7 @@
}
echo "Running protected MySQL... " | tee -a "$log_upgrade"
- $SAFE_MYSQLD \
- --mysqld=${MYSQLD#/usr/sbin/} \
+ $MYSQLD \
$debug_flags \
--skip-networking \
--skip-grant-tables \
@@ -514,6 +498,8 @@
rm -f /var/lib/mysql/.run-mysql_upgrade
rm -f /var/lib/mysql/.force_upgrade
rm -f "$datadir"/{update-stamp-*,mysql/stamp-4.1} # used in the past
+ MYSQLVERSION="`mysqld --version 2> /dev/null | sed -n 's|mysqld[[:blank:]]\+Ver[[:blank:]]\+\([^[:blank:]]\+\)[[:blank:]].*|\1|p'`"
+ [ -z "$MYSQLVERSION" ] || echo "$MYSQLVERSION" > "$datadir"/mysql_upgrade_info
chown --no-dereference "$mysql_daemon_user:$mysql_daemon_group" "$log_upgrade"
chmod 640 "$log_upgrade"
fi
++++++ series ++++++
--- /var/tmp/diff_new_pack.y5VfTY/_old 2015-04-27 22:07:23.000000000 +0200
+++ /var/tmp/diff_new_pack.y5VfTY/_new 2015-04-27 22:07:23.000000000 +0200
@@ -4,14 +4,14 @@
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-5.5.25-mysqld_multi-features.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.11-group.patch
+mariadb-10.0.17-group.patch
mariadb-10.0.5-deharcode-libdir.patch
-mariadb-10.0.14-upgrade-datadir.patch
+mariadb-10.0.15-upgrade-datadir.patch
mysql-community-server-5.6.12-srv_buf_size.patch
-mariadb-10.0.9-perl-in-bench.patch
-mariadb-10.0.11-header_files_const_warnings.patch
-mariadb-10.0.13-default-source.patch
+mariadb-10.0.16-header_files_const_warnings.patch
+mariadb-10.0.15-fortify-and-O.patch
+mariadb-10.0.15-logrotate-su.patch