Hello community, here is the log from the commit of package mariadb for openSUSE:Factory checked in at 2012-04-23 09:15:33 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/mariadb (Old) and /work/SRC/openSUSE:Factory/.mariadb.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "mariadb", Maintainer is "" Changes: -------- --- /work/SRC/openSUSE:Factory/mariadb/mariadb.changes 2012-04-12 09:40:53.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.mariadb.new/mariadb.changes 2012-04-23 09:15:35.000000000 +0200 @@ -1,0 +2,8 @@ +Sun Apr 15 09:51:54 CEST 2012 - mhrusecky@suse.cz + +- migrated to MariaDB 5.5.23, see: + http://kb.askmonty.org/en/what-is-mariadb-55 + http://kb.askmonty.org/en/release-notes-mariadb-55-series + http://kb.askmonty.org/en/changelogs-mariadb-55-series + +------------------------------------------------------------------- Old: ---- mariadb-5.3.6.tar.bz2 New: ---- mariadb-5.5.23.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ mariadb.spec ++++++ --- /var/tmp/diff_new_pack.RdzQn4/_old 2012-04-23 09:15:38.000000000 +0200 +++ /var/tmp/diff_new_pack.RdzQn4/_new 2012-04-23 09:15:38.000000000 +0200 @@ -19,11 +19,11 @@ # Few definitions which will alter build %define prefered 0 -%define use_cmake 0 +%define use_cmake 1 %define cluster 0 %define builtin_plugins partition,csv,heap,aria,pbxt,myisam,myisammrg,xtradb %define use_extra_provides 1 -%define extra_provides mariadb_53 +%define extra_provides mariadb_55 %if %{?rel:0}%{!?rel:1} %define rel 1 @@ -34,9 +34,9 @@ Name: mariadb Summary: Server part of MariaDB -Version: 5.3.6 +Version: 5.5.23 Release: 1 -%define srv_vers 5.1.62 +%define srv_vers 5.5.23 License: SUSE-GPL-2.0-with-FLOSS-exception Group: Productivity/Databases/Servers Url: http://www.mariab.org @@ -101,8 +101,8 @@ # mysql-devel was last used in openSUSE 10.2 Provides: mysql-devel = %srv_vers-%release Obsoletes: mysql-devel < %srv_vers -Requires: libmysqlclient16 = %version -Requires: libmysqlclient_r16 = %version +Requires: libmysqlclient18 = %version +Requires: libmysqlclient_r18 = %version Requires: glibc-devel Requires: openssl-devel Requires: zlib-devel @@ -114,12 +114,12 @@ This package contains the development header files and libraries necessary to develop client applications for MariaDB. -%package -n libmysqld16 +%package -n libmysqld18 License: SUSE-GPL-2.0-with-FLOSS-exception Summary: MariaDB embedded server development files Group: Development/Libraries/C and C++ -%description -n libmysqld16 +%description -n libmysqld18 This package contains the development header files and libraries for developing applications that embed the MariaDB. @@ -129,7 +129,7 @@ # the headers files are the shared Requires: libmysqlclient-devel = %version Requires: tcpd-devel -Requires: libmysqld16 = %version +Requires: libmysqld18 = %version Group: Development/Libraries/C and C++ %description -n libmysqld-devel @@ -137,21 +137,21 @@ for developing applications that embed the MariaDB. %endif -%package -n libmariadbclient16 +%package -n libmariadbclient18 Summary: Shared Libraries for MariaDB License: SUSE-GPL-2.0-with-FLOSS-exception Group: Development/Libraries/Other -%description -n libmariadbclient16 +%description -n libmariadbclient18 This package contains the shared libraries (.so) which certain languages and applications need to dynamically load and use MariaDB. -%package -n libmariadbclient_r16 +%package -n libmariadbclient_r18 Summary: Shared Libraries for MariaDB License: SUSE-GPL-2.0-with-FLOSS-exception Group: Development/Libraries/Other -%description -n libmariadbclient_r16 +%description -n libmariadbclient_r18 This package contains the shared libraries (.so) which certain languages and applications need to dynamically load and use MariaDB. @@ -410,13 +410,13 @@ # Various ldconfig post scripts # ####################################################################### -%post -n libmariadbclient16 -p /sbin/ldconfig +%post -n libmariadbclient18 -p /sbin/ldconfig -%postun -n libmariadbclient16 -p /sbin/ldconfig +%postun -n libmariadbclient18 -p /sbin/ldconfig -%post -n libmariadbclient_r16 -p /sbin/ldconfig +%post -n libmariadbclient_r18 -p /sbin/ldconfig -%postun -n libmariadbclient_r16 -p /sbin/ldconfig +%postun -n libmariadbclient_r18 -p /sbin/ldconfig %if 0%{cluster} > 1 @@ -484,7 +484,7 @@ %_libdir/libmysqld.so.* %endif -%files -n libmariadbclient16 +%files -n libmariadbclient18 %defattr(-, root, root) %{_libdir}/libmariadbclient.so.* @@ -495,7 +495,7 @@ %{_libdir}/libndbclient.so.* %endif -%files -n libmariadbclient_r16 +%files -n libmariadbclient_r18 %defattr(-, root, root) %{_libdir}/libmariadbclient_r.so.* ++++++ baselibs.conf ++++++ --- /var/tmp/diff_new_pack.RdzQn4/_old 2012-04-23 09:15:38.000000000 +0200 +++ /var/tmp/diff_new_pack.RdzQn4/_new 2012-04-23 09:15:38.000000000 +0200 @@ -1,2 +1,2 @@ -libmariadbclient16 -libmariadbclient_r16 +libmariadbclient18 +libmariadbclient_r18 ++++++ configuration-tweaks.tar.bz2 ++++++ ++++++ mariadb-5.3.6.tar.bz2 -> mariadb-5.5.23.tar.bz2 ++++++ /work/SRC/openSUSE:Factory/mariadb/mariadb-5.3.6.tar.bz2 /work/SRC/openSUSE:Factory/.mariadb.new/mariadb-5.5.23.tar.bz2 differ: char 11, line 1 ++++++ mysql-patches.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/mysql-patches/mysql-patches/mariadb-5.2.4-libmysql-no-pkglibdir.patch new/mysql-patches/mysql-patches/mariadb-5.2.4-libmysql-no-pkglibdir.patch --- old/mysql-patches/mysql-patches/mariadb-5.2.4-libmysql-no-pkglibdir.patch 2011-10-11 12:25:33.000000000 +0200 +++ new/mysql-patches/mysql-patches/mariadb-5.2.4-libmysql-no-pkglibdir.patch 1970-01-01 01:00:00.000000000 +0100 @@ -1,32 +0,0 @@ -PATCH-P0-FIX-UPSTREAM: Use lib_LIBRARIES instead of pkglib_LIBRARIES - -Make more sense and is more intuitive when compiling. - -Maintainer: Michal Hrusecky <Michal.Hrusecky@opensuse.org> - -Index: libmysql/Makefile.shared -=================================================================== ---- libmysql/Makefile.shared.orig -+++ libmysql/Makefile.shared -@@ -27,7 +27,7 @@ pkgplugindir = $(pkglibdir)/plugin - ## We'll use CLIENT_EXTRA_LDFLAGS for threaded and non-threaded - ## until someone complains that they need separate options. - LDADD = @CLIENT_EXTRA_LDFLAGS@ $(target) --pkglib_LTLIBRARIES = $(target) -+lib_LTLIBRARIES = $(target) - - noinst_PROGRAMS = conf_to_src - -Index: libmysqld/Makefile.am -=================================================================== ---- libmysqld/Makefile.am.orig -+++ libmysqld/Makefile.am -@@ -37,7 +37,7 @@ INCLUDES= -I$(top_builddir)/include -I$ - @condition_dependent_plugin_includes@ \ - @ndbcluster_includes@ - --pkglib_LTLIBRARIES = libmysqld.la -+lib_LTLIBRARIES = libmysqld.la - SUBDIRS = . examples - libmysqld_sources= libmysqld.c lib_sql.cc emb_qcache.cc - libmysqlsources = errmsg.c get_password.c libmysql.c client.c pack.c \ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/mysql-patches/mysql-patches/mariadb-5.2.6-group.patch new/mysql-patches/mysql-patches/mariadb-5.2.6-group.patch --- old/mysql-patches/mysql-patches/mariadb-5.2.6-group.patch 2011-10-11 12:25:33.000000000 +0200 +++ new/mysql-patches/mysql-patches/mariadb-5.2.6-group.patch 1970-01-01 01:00:00.000000000 +0100 @@ -1,155 +0,0 @@ -PATCH-P0-FEATURE-UPSTREAM: Adds group option - -This patch let's you specify not only user to use but also group that MySQL -should use. - -Maintainer: Michal Hrusecky <mhrusecky@suse.cz> - -Index: configure.in -=================================================================== ---- configure.in.orig -+++ configure.in -@@ -818,6 +818,14 @@ AC_ARG_WITH(mysqld-user, - [ MYSQLD_USER=mysql ] - ) - AC_SUBST(MYSQLD_USER) -+AC_ARG_WITH(mysqld-group, -+ [ --with-mysqld-group=groupname -+ What group the mysqld daemon shall be run as.], -+ [ MYSQLD_GROUP=$withval ], -+ [ MYSQLD_GROUP=mysql ] -+ ) -+AC_SUBST(MYSQLD_GROUP) -+ - - # If we should allow LOAD DATA LOCAL - AC_MSG_CHECKING(If we should should enable LOAD DATA LOCAL by default) -Index: scripts/Makefile.am -=================================================================== ---- scripts/Makefile.am.orig -+++ scripts/Makefile.am -@@ -189,6 +189,7 @@ SUFFIXES = .sh - -e 's!@''TARGET_LINUX''@!@TARGET_LINUX@!' \ - -e "s!@""CONF_COMMAND""@!@CONF_COMMAND@!" \ - -e 's!@''MYSQLD_USER''@!@MYSQLD_USER@!' \ -+ -e 's!@''MYSQLD_GROUP''@!@MYSQLD_GROUP@!' \ - -e 's!@''STATIC_NSS_FLAGS''@!@STATIC_NSS_FLAGS@!' \ - -e 's!@''NON_THREADED_LIBS''@!@NON_THREADED_LIBS@!' \ - -e 's!@''ZLIB_DEPS''@!@ZLIB_DEPS@!' \ -Index: scripts/mysqld_safe.sh -=================================================================== ---- scripts/mysqld_safe.sh.orig -+++ scripts/mysqld_safe.sh -@@ -19,6 +19,7 @@ logging=init - want_syslog=0 - syslog_tag= - user='@MYSQLD_USER@' -+group='@MYSQLD_GROUP@' - pid_file= - err_log= - -@@ -162,6 +163,7 @@ parse_arguments() { - --datadir=*|--data=*) DATADIR="$val" ;; - --pid-file=*) pid_file="$val" ;; - --user=*) user="$val"; SET_USER=1 ;; -+ --group=*) group="$val"; SET_USER=1 ;; - --log-basename=*|--hostname=*|--loose-log-basename=*) - pid_file="$val.pid"; - err_log="$val.err"; -@@ -393,11 +395,17 @@ then - if test "$user" != "root" -o $SET_USER = 1 - then - USER_OPTION="--user=$user" -+ GROUP_OPTION="--group=$group" - fi - # Change the err log to the right user, if it is in use - if [ $want_syslog -eq 0 ]; then - touch "$err_log" -- chown $user "$err_log" -+ if [ "$user" -a "$group" ]; then -+ chown $user:$group $err_log -+ else -+ [ "$user" ] && chown $user $err_log -+ [ "$group" ] && chgrp $group $err_log -+ fi - fi - if test -n "$open_files" - then -@@ -420,7 +428,12 @@ then - echo "Fatal error Can't create database directory '$mysql_unix_port'" - exit 1 - fi -- chown $user $mysql_unix_port_dir -+ if [ "$user" -a "$group" ]; then -+ chown $user:$group $mysql_unix_port_dir -+ else -+ [ "$user" ] && chown $user $mysql_unix_port_dir -+ [ "$group" ] && chgrp $group $mysql_unix_port_dir -+ fi - chmod 755 $mysql_unix_port_dir - fi - -Index: scripts/mysql_install_db.sh -=================================================================== ---- scripts/mysql_install_db.sh.orig -+++ scripts/mysql_install_db.sh -@@ -28,6 +28,7 @@ args="" - defaults="" - mysqld_opt="" - user="" -+group="" - - force=0 - in_rpm=0 -@@ -66,6 +67,11 @@ Usage: $0 [OPTIONS] - user. You must be root to use this option. By default - mysqld runs using your current login name and files and - directories that it creates will be owned by you. -+ --group=group_name The login group to use for running mysqld. Files and -+ directories created by mysqld will be owned by this -+ group. You must be root to use this option. By default -+ mysqld runs using your current group and files and -+ directories that it creates will be owned by you. - - All other options are passed to the mysqld program - -@@ -113,11 +119,11 @@ parse_arguments() - --builddir=*) builddir=`parse_arg "$arg"` ;; - --srcdir=*) srcdir=`parse_arg "$arg"` ;; - --ldata=*|--datadir=*|--data=*) ldata=`parse_arg "$arg"` ;; -- --user=*) - # Note that the user will be passed to mysqld so that it runs - # as 'user' (crucial e.g. if log-bin=/some_other_path/ - # where a chown of datadir won't help) -- user=`parse_arg "$arg"` ;; -+ --user=*) user=`parse_arg "$arg"` ;; -+ --group=*) group=`parse_arg "$arg"` ;; - --skip-name-resolve) ip_only=1 ;; - --verbose) verbose=1 ;; # Obsolete - --rpm) in_rpm=1 ;; -@@ -377,7 +383,12 @@ do - fi - if test -w / -a ! -z "$user" - then -- chown $user $dir -+ if test -z "$group" -+ then -+ chown $user $dir -+ else -+ chown $user:$group $dir -+ fi - fi - done - -@@ -386,6 +397,11 @@ then - args="$args --user=$user" - fi - -+if test -n "$group" -+then -+ args="$args --group=$group" -+fi -+ - # When doing a "cross bootstrap" install, no reference to the current - # host should be added to the system tables. So we filter out any - # lines which contain the current host name. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/mysql-patches/mysql-patches/mariadb-5.2.6-safe-process-in-bin.patch new/mysql-patches/mysql-patches/mariadb-5.2.6-safe-process-in-bin.patch --- old/mysql-patches/mysql-patches/mariadb-5.2.6-safe-process-in-bin.patch 2011-10-11 12:25:33.000000000 +0200 +++ new/mysql-patches/mysql-patches/mariadb-5.2.6-safe-process-in-bin.patch 1970-01-01 01:00:00.000000000 +0100 @@ -1,32 +0,0 @@ -PATCH-P0-FEATURE-SUSE: Moving SafeProcess to /usr/bin - -We prefer to have this script somewhere else, so we moved it out of -the mysql-test directory. - -Maintainer: Michal Hrusecky <Michal.Hrusecky@opensuse.org> - -Index: mysql-test/lib/My/SafeProcess.pm -=================================================================== ---- mysql-test/lib/My/SafeProcess.pm.orig -+++ mysql-test/lib/My/SafeProcess.pm -@@ -103,17 +103,17 @@ sub find_bin { - if (IS_WIN32PERL or IS_CYGWIN) - { - # Use my_safe_process.exe -- my $exe= my_find_bin($bindir, ["lib/My/SafeProcess", "My/SafeProcess"], -+ my $exe= my_find_bin($bindir, ["../../bin", "lib/My/SafeProcess", "My/SafeProcess"], - "my_safe_process"); - push(@safe_process_cmd, $exe); - - # Use my_safe_kill.exe -- $safe_kill= my_find_bin($bindir, "lib/My/SafeProcess", "my_safe_kill"); -+ $safe_kill= my_find_bin($bindir, "../../bin", "lib/My/SafeProcess", "my_safe_kill"); - } - else - { - # Use my_safe_process -- my $exe= my_find_bin($bindir, ["lib/My/SafeProcess", "My/SafeProcess"], -+ my $exe= my_find_bin($bindir, ["../../bin", "lib/My/SafeProcess", "My/SafeProcess"], - "my_safe_process"); - push(@safe_process_cmd, $exe); - } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/mysql-patches/mysql-patches/mariadb-5.3.2-plugins-avoid-version.patch new/mysql-patches/mysql-patches/mariadb-5.3.2-plugins-avoid-version.patch --- old/mysql-patches/mysql-patches/mariadb-5.3.2-plugins-avoid-version.patch 2012-02-18 08:32:06.000000000 +0100 +++ new/mysql-patches/mysql-patches/mariadb-5.3.2-plugins-avoid-version.patch 1970-01-01 01:00:00.000000000 +0100 @@ -1,155 +0,0 @@ -PATCH-P0-FEATURE-DOWNSTREAM: Avoid version for all plugins - -Making all storage plugins unversioned. - -Maintainer: Michal Hrusecky <Michal.Hrusecky@opensuse.org> - -Index: storage/blackhole/Makefile.am -=================================================================== ---- storage/blackhole/Makefile.am.orig -+++ storage/blackhole/Makefile.am -@@ -34,7 +34,7 @@ noinst_HEADERS = ha_blackhole.h - - EXTRA_LTLIBRARIES = libblackhole.la ha_blackhole.la - pkgplugin_LTLIBRARIES = @plugin_blackhole_shared_target@ --ha_blackhole_la_LDFLAGS=-module -rpath $(pkgplugindir) -+ha_blackhole_la_LDFLAGS=-module -avoid-version -rpath $(pkgplugindir) - ha_blackhole_la_CXXFLAGS=-shared $(AM_CXXFLAGS) -DMYSQL_DYNAMIC_PLUGIN - ha_blackhole_la_SOURCES=ha_blackhole.cc - -Index: storage/archive/Makefile.am -=================================================================== ---- storage/archive/Makefile.am.orig -+++ storage/archive/Makefile.am -@@ -35,7 +35,7 @@ noinst_PROGRAMS = archive_test archive_r - - EXTRA_LTLIBRARIES = libarchive.la ha_archive.la - pkgplugin_LTLIBRARIES = @plugin_archive_shared_target@ --ha_archive_la_LDFLAGS = -module -rpath $(pkgplugindir) -+ha_archive_la_LDFLAGS = -module -avoid-version -rpath $(pkgplugindir) - ha_archive_la_CXXFLAGS= -shared $(AM_CXXFLAGS) -DMYSQL_DYNAMIC_PLUGIN - ha_archive_la_CFLAGS = -shared $(AM_CFLAGS) -DMYSQL_DYNAMIC_PLUGIN - ha_archive_la_SOURCES = ha_archive.cc azio.c -Index: storage/example/Makefile.am -=================================================================== ---- storage/example/Makefile.am.orig -+++ storage/example/Makefile.am -@@ -34,7 +34,7 @@ noinst_HEADERS = ha_example.h - - EXTRA_LTLIBRARIES = libexample.la ha_example.la - pkgplugin_LTLIBRARIES = @plugin_example_shared_target@ --ha_example_la_LDFLAGS = -module -rpath $(pkgplugindir) -L$(top_builddir)/libservices -lmysqlservices -+ha_example_la_LDFLAGS = -module -avoid-version -rpath $(pkgplugindir) -L$(top_builddir)/libservices -lmysqlservices - ha_example_la_CXXFLAGS= -shared $(AM_CXXFLAGS) -DMYSQL_DYNAMIC_PLUGIN - ha_example_la_SOURCES = ha_example.cc - -Index: storage/federated/Makefile.am -=================================================================== ---- storage/federated/Makefile.am.orig -+++ storage/federated/Makefile.am -@@ -32,7 +32,7 @@ noinst_HEADERS = ha_federated.h - - EXTRA_LTLIBRARIES = libfederated.la libfederated_embedded.la ha_federated.la - pkgplugin_LTLIBRARIES = @plugin_federated_shared_target@ --ha_federated_la_LDFLAGS = -module -rpath $(pkgplugindir) \ -+ha_federated_la_LDFLAGS = -avoid-version -module -rpath $(pkgplugindir) \ - -L$(top_builddir)/libservices -lmysqlservices - ha_federated_la_CXXFLAGS= -shared $(AM_CXXFLAGS) -DMYSQL_DYNAMIC_PLUGIN - ha_federated_la_CFLAGS = -shared $(AM_CFLAGS) -DMYSQL_DYNAMIC_PLUGIN -Index: storage/innodb_plugin/Makefile.am -=================================================================== ---- storage/innodb_plugin/Makefile.am.orig -+++ storage/innodb_plugin/Makefile.am -@@ -330,7 +330,7 @@ libinnobase_la_CFLAGS= $(AM_CFLAGS) - EXTRA_LTLIBRARIES= libinnobase.la ha_innodb_plugin.la - pkgplugin_LTLIBRARIES= @plugin_innodb_plugin_shared_target@ - --ha_innodb_plugin_la_LDFLAGS= -module -rpath $(pkgplugindir) -L$(top_builddir)/libservices -lmysqlservices -+ha_innodb_plugin_la_LDFLAGS= -avoid-version -module -rpath $(pkgplugindir) -L$(top_builddir)/libservices -lmysqlservices - ha_innodb_plugin_la_CXXFLAGS= -shared $(AM_CXXFLAGS) $(INNODB_DYNAMIC_CFLAGS) - ha_innodb_plugin_la_CFLAGS= -shared $(AM_CFLAGS) $(INNODB_DYNAMIC_CFLAGS) - ha_innodb_plugin_la_SOURCES= $(libinnobase_la_SOURCES) -Index: plugin/auth/Makefile.am -=================================================================== ---- plugin/auth/Makefile.am.orig -+++ plugin/auth/Makefile.am -@@ -1,6 +1,6 @@ - pkgplugindir=$(pkglibdir)/plugin - --AM_LDFLAGS=-module -rpath $(pkgplugindir) -+AM_LDFLAGS=-module -avoid-version -rpath $(pkgplugindir) - AM_CPPFLAGS=-DMYSQL_DYNAMIC_PLUGIN -I$(top_srcdir)/include - - pkgplugin_LTLIBRARIES= dialog.la -Index: storage/federatedx/Makefile.am -=================================================================== ---- storage/federatedx/Makefile.am.orig -+++ storage/federatedx/Makefile.am -@@ -19,7 +19,7 @@ noinst_HEADERS = ha_federatedx.h federat - - EXTRA_LTLIBRARIES = libfederatedx.la libfederatedx_common.la libfederatedx_embedded.la ha_federatedx.la - pkgplugin_LTLIBRARIES = @plugin_federatedx_shared_target@ --ha_federatedx_la_LDFLAGS = -module -rpath $(pkgplugindir) \ -+ha_federatedx_la_LDFLAGS = -module -avoid-version -rpath $(pkgplugindir) \ - -L$(top_builddir)/libservices -lmysqlservices - ha_federatedx_la_CXXFLAGS= -shared $(AM_CXXFLAGS) -DMYSQL_DYNAMIC_PLUGIN - -Index: storage/sphinx/Makefile.am -=================================================================== ---- storage/sphinx/Makefile.am.orig -+++ storage/sphinx/Makefile.am -@@ -33,13 +33,13 @@ noinst_HEADERS = ha_sphinx.h - EXTRA_LTLIBRARIES = libsphinx.la ha_sphinx.la - pkgplugin_LTLIBRARIES = @plugin_sphinx_shared_target@ sphinx.la - --ha_sphinx_la_LDFLAGS = -module -rpath $(MYSQLLIBdir) \ -+ha_sphinx_la_LDFLAGS = -module -avoid-version -rpath $(MYSQLLIBdir) \ - -L$(top_builddir)/libservices -lmysqlservices - ha_sphinx_la_CXXFLAGS= $(AM_CXXFLAGS) -DMYSQL_DYNAMIC_PLUGIN - ha_sphinx_la_CFLAGS = $(AM_CFLAGS) -DMYSQL_DYNAMIC_PLUGIN - ha_sphinx_la_SOURCES = ha_sphinx.cc - --sphinx_la_LDFLAGS = -module -+sphinx_la_LDFLAGS = -module -avoid-version - sphinx_la_CXXFLAGS = $(AM_CXXFLAGS) - sphinx_la_CFLAGS = $(AM_CFLAGS) - sphinx_la_SOURCES = snippets_udf.cc -Index: plugin/handler_socket/handlersocket/Makefile.am -=================================================================== ---- plugin/handler_socket/handlersocket/Makefile.am.orig -+++ plugin/handler_socket/handlersocket/Makefile.am -@@ -2,7 +2,7 @@ pkgplugindir = $(PLUGIN_DIR) - CXXFLAGS += -fimplicit-templates - noinst_HEADERS = database.hpp hstcpsvr.hpp hstcpsvr_worker.hpp mysql_incl.hpp - pkgplugin_LTLIBRARIES = handlersocket.la --handlersocket_la_LDFLAGS = -module ../libhsclient/libhsclient.la -L$(top_builddir)/libservices -lmysqlservices -+handlersocket_la_LDFLAGS = -module -avoid-version ../libhsclient/libhsclient.la -L$(top_builddir)/libservices -lmysqlservices - handlersocket_la_CXXFLAGS = $(MYSQL_INC) $(MYSQL_CFLAGS) $(AM_CXXFLAGS) -I$(srcdir)/../libhsclient - handlersocket_la_SOURCES = database.cpp handlersocket.cpp \ - hstcpsvr_worker.cpp hstcpsvr.cpp -Index: plugin/feedback/Makefile.am -=================================================================== ---- plugin/feedback/Makefile.am.orig -+++ plugin/feedback/Makefile.am -@@ -4,7 +4,7 @@ INCLUDES = -I$(top_srcdir)/ - - EXTRA_LTLIBRARIES = feedback.la libfeedback.la - pkgplugin_LTLIBRARIES = @plugin_feedback_shared_target@ --feedback_la_LDFLAGS = -module -rpath $(pkgplugindir) -L$(top_builddir)/libservices -lmysqlservices -+feedback_la_LDFLAGS = -avoid-version -module -rpath $(pkgplugindir) -L$(top_builddir)/libservices -lmysqlservices - feedback_la_CXXFLAGS = -shared -DMYSQL_DYNAMIC_PLUGIN - feedback_la_SOURCES = feedback.cc utils.cc url_base.cc url_http.cc \ - sender_thread.cc -Index: plugin/auth_pam/Makefile.am -=================================================================== ---- plugin/auth_pam/Makefile.am.orig -+++ plugin/auth_pam/Makefile.am -@@ -4,7 +4,7 @@ pkgplugindir=$(pkglibdir)/plugin - AM_CPPFLAGS = -I$(top_srcdir)/include - - pkgplugin_LTLIBRARIES = @plugin_auth_pam_shared_target@ --auth_pam_la_LDFLAGS = -module -rpath $(pkgplugindir) -L$(top_builddir)/libservices -lmysqlservices -lpam -+auth_pam_la_LDFLAGS = -module -avoid-version -rpath $(pkgplugindir) -L$(top_builddir)/libservices -lmysqlservices -lpam - auth_pam_la_CFLAGS = -shared -DMYSQL_DYNAMIC_PLUGIN - auth_pam_la_SOURCES = auth_pam.c - diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/mysql-patches/mysql-patches/mariadb-5.3.2-scripts-paths.patch new/mysql-patches/mysql-patches/mariadb-5.3.2-scripts-paths.patch --- old/mysql-patches/mysql-patches/mariadb-5.3.2-scripts-paths.patch 2011-12-07 17:24:30.000000000 +0100 +++ new/mysql-patches/mysql-patches/mariadb-5.3.2-scripts-paths.patch 1970-01-01 01:00:00.000000000 +0100 @@ -1,29 +0,0 @@ -PATCH-P0-FIX-UPSTREAM: Fix building in different directory -BUGS: upstream#45616 - -Makes it possible to run compilation somewhere else then source code is. - -Maintainer: Michal Hrusecky <Michal.Hrusecky@opensuse.org> - -Index: scripts/Makefile.am -=================================================================== ---- scripts/Makefile.am.orig -+++ scripts/Makefile.am -@@ -120,7 +120,7 @@ mysql_fix_privilege_tables.sql: mysql_sy - @echo "-- This file is automaticly generated from" > $@ - @echo "-- mysql_system_tables.sql & mysql_system_tables_fix.sql" >> $@ - @echo "" >> $@ -- @cat mysql_system_tables.sql mysql_system_tables_fix.sql >> $@ -+ @cat $(top_srcdir)/scripts/mysql_system_tables.sql $(top_srcdir)/scripts/mysql_system_tables_fix.sql > $@ - - # - # Build mysql_fix_privilege_tables_sql.c from -@@ -133,7 +133,7 @@ mysql_fix_privilege_tables_sql.c: comp_s - sleep 2 - $(top_builddir)/scripts/comp_sql$(EXEEXT) \ - mysql_fix_privilege_tables \ -- $(top_srcdir)/scripts/mysql_fix_privilege_tables.sql $@ -+ $(top_builddir)/scripts/mysql_fix_privilege_tables.sql $@ - - - SUFFIXES = .sh diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/mysql-patches/mysql-patches/mariadb-5.3.3-compilation-fix.patch new/mysql-patches/mysql-patches/mariadb-5.3.3-compilation-fix.patch --- old/mysql-patches/mysql-patches/mariadb-5.3.3-compilation-fix.patch 2011-12-22 12:52:29.000000000 +0100 +++ new/mysql-patches/mysql-patches/mariadb-5.3.3-compilation-fix.patch 1970-01-01 01:00:00.000000000 +0100 @@ -1,216 +0,0 @@ -PATCH-P0-HACK-SUSE: Fixing few compilation problems - -Mostly minor things. Mostly just to make compiler happy as it can't determine -that everything is ok. But few things might actually worth reporting as they -could be handled better (mostly the write calls). - -Maintainer: Michal Hrusecky <mhrusecky@suse.cz> - -Index: client/readline.cc -=================================================================== ---- client/readline.cc.orig -+++ client/readline.cc -@@ -57,7 +57,7 @@ LINE_BUFFER *batch_readline_init(ulong m - char *batch_readline(LINE_BUFFER *line_buff) - { - char *pos; -- ulong out_length; -+ ulong out_length=0; - LINT_INIT(out_length); - - if (!(pos=intern_read_line(line_buff, &out_length))) -Index: storage/innodb_plugin/ut/ut0ut.c -=================================================================== ---- storage/innodb_plugin/ut/ut0ut.c.orig -+++ storage/innodb_plugin/ut/ut0ut.c -@@ -553,7 +553,9 @@ ut_print_namel( - trx ? trx->mysql_thd : NULL, - table_id); - -- fwrite(buf, 1, bufend - buf, f); -+ if(fwrite(buf, 1, bufend - buf, f) != (size_t)max(0,(bufend - buf))) { -+ fprintf(stderr, "fwrite failed in ut_print_namel!!!\n"); -+ } - } - - /**********************************************************************//** -@@ -574,7 +576,8 @@ ut_copy_file( - ? (size_t) len - : sizeof buf; - size_t size = fread(buf, 1, maxs, src); -- fwrite(buf, 1, size, dest); -+ if(fwrite(buf, size, 1, dest)<size) -+ break; - len -= (long) size; - if (size < maxs) { - break; -Index: storage/ndb/src/common/util/ndb_init.c -=================================================================== ---- storage/ndb/src/common/util/ndb_init.c.orig -+++ storage/ndb/src/common/util/ndb_init.c -@@ -31,7 +31,7 @@ ndb_init() - { - if (my_init()) { - const char* err = "my_init() failed - exit\n"; -- write(2, err, strlen(err)); -+ fprintf(stderr, err, strlen(err)); - exit(1); - } - ndb_init_internal(); -Index: sql/log.cc -=================================================================== ---- sql/log.cc.orig -+++ sql/log.cc -@@ -1936,7 +1936,7 @@ static void setup_windows_event_source() - - static int find_uniq_filename(char *name) - { -- long number; -+ long number=0; - uint i; - char buff[FN_REFLEN]; - struct st_my_dir *dir_info; -Index: sql/filesort.cc -=================================================================== ---- sql/filesort.cc.orig -+++ sql/filesort.cc -@@ -435,16 +435,20 @@ static void dbug_print_record(TABLE *tab - Field *field= *pfield; - - if (field->is_null()) -- fwrite("NULL", sizeof(char), 4, DBUG_FILE); -+ if(fwrite("NULL", sizeof(char), 4, DBUG_FILE) != sizeof(char) * 4) -+ break; - - if (field->type() == MYSQL_TYPE_BIT) - (void) field->val_int_as_str(&tmp, 1); - else - field->val_str(&tmp); - -- fwrite(tmp.ptr(),sizeof(char),tmp.length(),DBUG_FILE); -+ if(fwrite(tmp.ptr(),sizeof(char),tmp.length(),DBUG_FILE) != -+ sizeof(char) * tmp.length()) -+ break; - if (pfield[1]) -- fwrite(", ", sizeof(char), 2, DBUG_FILE); -+ if(fwrite(", ", sizeof(char), 2, DBUG_FILE) != sizeof(char) * 2) -+ break; - } - fprintf(DBUG_FILE, ")"); - if (print_rowid) -Index: sql/opt_range.cc -=================================================================== ---- sql/opt_range.cc.orig -+++ sql/opt_range.cc -@@ -13668,7 +13668,8 @@ print_key(KEY_PART *key_part, const ucha - { - if (*key) - { -- fwrite("NULL",sizeof(char),4,DBUG_FILE); -+ if(fwrite("NULL",sizeof(char),4,DBUG_FILE)!=4*sizeof(char)) -+ break; - continue; - } - key++; // Skip null byte -@@ -13679,7 +13680,8 @@ print_key(KEY_PART *key_part, const ucha - (void) field->val_int_as_str(&tmp, 1); - else - field->val_str(&tmp); -- fwrite(tmp.ptr(),sizeof(char),tmp.length(),DBUG_FILE); -+ if(fwrite(tmp.ptr(),sizeof(char),tmp.length(),DBUG_FILE)!=sizeof(char)*tmp.length()) -+ break; - if (key+store_length < key_end) - fputc('/',DBUG_FILE); - } -Index: sql/debug_sync.cc -=================================================================== ---- sql/debug_sync.cc.orig -+++ sql/debug_sync.cc -@@ -1722,6 +1722,7 @@ static void debug_sync_execute(THD *thd, - LINT_INIT(old_proc_info); - - action->execute--; -+ old_proc_info = NULL; - - /* - If we will be going to wait, set proc_info for the PROCESSLIST table. -Index: storage/xtradb/ut/ut0ut.c -=================================================================== ---- storage/xtradb/ut/ut0ut.c.orig -+++ storage/xtradb/ut/ut0ut.c -@@ -552,8 +552,9 @@ ut_print_namel( - name, namelen, - trx ? trx->mysql_thd : NULL, - table_id); -- -- (void) fwrite(buf, 1, bufend - buf, f); -+ if(fwrite(buf, 1, bufend - buf, f) != (size_t)max(0,(bufend - buf))) { -+ fprintf(stderr, "fwrite failed in ut_print_namel!!!\n"); -+ } - } - - /**********************************************************************//** -@@ -574,7 +575,8 @@ ut_copy_file( - ? (size_t) len - : sizeof buf; - size_t size = fread(buf, 1, maxs, src); -- (void) fwrite(buf, 1, size, dest); -+ if(fwrite(buf, size, 1, dest)<size) -+ break; - len -= (long) size; - if (size < maxs) { - break; -Index: storage/maria/ma_open.c -=================================================================== ---- storage/maria/ma_open.c.orig -+++ storage/maria/ma_open.c -@@ -1847,7 +1847,6 @@ void _ma_set_index_pagecache_callbacks(P - int _ma_open_datafile(MARIA_HA *info, MARIA_SHARE *share, const char *org_name, - File file_to_dup __attribute__((unused))) - { -- char *data_name= share->data_file_name.str; - char real_data_name[FN_REFLEN]; - - if (org_name) -@@ -1861,12 +1860,11 @@ int _ma_open_datafile(MARIA_HA *info, MA - my_errno= HA_WRONG_CREATE_OPTION; - return 1; - } -- data_name= real_data_name; - } - } - - info->dfile.file= share->bitmap.file.file= -- my_open(data_name, share->mode | O_SHARE, MYF(MY_WME)); -+ my_open(real_data_name, share->mode | O_SHARE, MYF(MY_WME)); - return info->dfile.file >= 0 ? 0 : 1; - } - -Index: storage/maria/ha_maria.cc -=================================================================== ---- storage/maria/ha_maria.cc.orig -+++ storage/maria/ha_maria.cc -@@ -2980,7 +2980,7 @@ int ha_maria::create(const char *name, r - HA_CREATE_INFO *ha_create_info) - { - int error; -- uint create_flags= 0, record_count, i; -+ uint create_flags= 0, record_count=0, i; - char buff[FN_REFLEN]; - MARIA_KEYDEF *keydef; - MARIA_COLUMNDEF *recinfo; -Index: storage/pbxt/src/discover_xt.cc -=================================================================== ---- storage/pbxt/src/discover_xt.cc.orig -+++ storage/pbxt/src/discover_xt.cc -@@ -1337,8 +1337,8 @@ static bool mysql_create_table_no_lock(T - char path[FN_REFLEN]; - uint path_length; - const char *alias; -- uint db_options, key_count; -- KEY *key_info_buffer; -+ uint db_options, key_count=0; -+ KEY *key_info_buffer=NULL; - handler *file; - bool error= TRUE; - DBUG_ENTER("mysql_create_table_no_lock"); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/mysql-patches/mysql-patches/mariadb-5.3.3-myslq-test.patch new/mysql-patches/mysql-patches/mariadb-5.3.3-myslq-test.patch --- old/mysql-patches/mysql-patches/mariadb-5.3.3-myslq-test.patch 2011-12-22 10:51:32.000000000 +0100 +++ new/mysql-patches/mysql-patches/mariadb-5.3.3-myslq-test.patch 1970-01-01 01:00:00.000000000 +0100 @@ -1,33 +0,0 @@ -PATCH-P0-FEATURE-SUSE: Tests in $(datadir) - -By default tests would get installed to /usr and as we want it LSB compilant, -we install them into /usr/share. - -Maintainer: Michal Hrusecky <Michal.Hrusecky@opensuse.org> - -Index: mysql-test/Makefile.am -=================================================================== ---- mysql-test/Makefile.am.orig -+++ mysql-test/Makefile.am -@@ -17,7 +17,7 @@ - - ## Process this file with automake to create Makefile.in - --testroot = $(prefix) -+testroot = $(datadir) - testdir = $(testroot)/mysql-test - - test_SCRIPTS = mtr \ -Index: mysql-test/lib/My/SafeProcess/Makefile.am -=================================================================== ---- mysql-test/lib/My/SafeProcess/Makefile.am.orig -+++ mysql-test/lib/My/SafeProcess/Makefile.am -@@ -14,7 +14,7 @@ - # along with this program; if not, write to the Free Software - # Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA - --testroot = $(prefix) -+testroot = $(datadir) - safedir = $(testroot)/mysql-test/lib/My/SafeProcess - #nobase_bin_PROGRAMS = ... - safe_PROGRAMS = my_safe_process diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/mysql-patches/mysql-patches/mariadb-5.3.3-readline-includes.patch new/mysql-patches/mysql-patches/mariadb-5.3.3-readline-includes.patch --- old/mysql-patches/mysql-patches/mariadb-5.3.3-readline-includes.patch 2011-12-22 12:00:17.000000000 +0100 +++ new/mysql-patches/mysql-patches/mariadb-5.3.3-readline-includes.patch 1970-01-01 01:00:00.000000000 +0100 @@ -1,19 +0,0 @@ -PATCH-P0-HACK-UPSTREAM: Fixing readline check - -HIST_ENTRY symbol is not defined in main include, but in history.h for -readline. At least in new readline. - -Maintainer: Michal Hrusecky <mhrusecky@suse.cz> - -Index: config/ac-macros/readline.m4 -=================================================================== ---- config/ac-macros/readline.m4.orig -+++ config/ac-macros/readline.m4 -@@ -4,6 +4,7 @@ AC_DEFUN([MYSQL_CHECK_READLINE_DECLARES_ - [ - #include "stdio.h" - #include "readline/readline.h" -+ #include "readline/history.h" - ], - [ - HIST_ENTRY entry; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/mysql-patches/mysql-patches/mariadb-5.5.20-group.patch new/mysql-patches/mysql-patches/mariadb-5.5.20-group.patch --- old/mysql-patches/mysql-patches/mariadb-5.5.20-group.patch 1970-01-01 01:00:00.000000000 +0100 +++ new/mysql-patches/mysql-patches/mariadb-5.5.20-group.patch 2012-02-27 22:40:26.000000000 +0100 @@ -0,0 +1,148 @@ +PATCH-P0-FEATURE-UPSTREAM: Adds group option + +This patch let's you specify not only user to use but also group that MySQL +should use. + +Maintainer: Michal Hrusecky <mhrusecky@suse.cz> + +Index: scripts/mysqld_safe.sh +=================================================================== +--- scripts/mysqld_safe.sh.orig ++++ scripts/mysqld_safe.sh +@@ -23,6 +23,7 @@ logging=init + want_syslog=0 + syslog_tag= + user='@MYSQLD_USER@' ++group='@MYSQLD_GROUP@' + pid_file= + err_log= + +@@ -176,6 +177,7 @@ parse_arguments() { + --pid-file=*) pid_file="$val" ;; + --plugin-dir=*) PLUGIN_DIR="$val" ;; + --user=*) user="$val"; SET_USER=1 ;; ++ --group=*) group="$val"; SET_USER=1 ;; + --log-basename=*|--hostname=*|--loose-log-basename=*) + pid_file="$val.pid"; + err_log="$val.err"; +@@ -567,11 +569,17 @@ then + if test "$user" != "root" -o $SET_USER = 1 + then + USER_OPTION="--user=$user" ++ GROUP_OPTION="--group=$group" + fi + # Change the err log to the right user, if it is in use + if [ $want_syslog -eq 0 ]; then + touch "$err_log" +- chown $user "$err_log" ++ if [ "$user" -a "$group" ]; then ++ chown $user:$group $err_log ++ else ++ [ "$user" ] && chown $user $err_log ++ [ "$group" ] && chgrp $group $err_log ++ fi + fi + if test -n "$open_files" + then +@@ -594,7 +602,12 @@ then + echo "Fatal error Can't create database directory '$mysql_unix_port'" + exit 1 + fi +- chown $user $mysql_unix_port_dir ++ if [ "$user" -a "$group" ]; then ++ chown $user:$group $mysql_unix_port_dir ++ else ++ [ "$user" ] && chown $user $mysql_unix_port_dir ++ [ "$group" ] && chgrp $group $mysql_unix_port_dir ++ fi + chmod 755 $mysql_unix_port_dir + fi + +Index: scripts/mysql_install_db.sh +=================================================================== +--- scripts/mysql_install_db.sh.orig ++++ scripts/mysql_install_db.sh +@@ -30,6 +30,7 @@ args="" + defaults="" + mysqld_opt="" + user="" ++group="" + + force=0 + in_rpm=0 +@@ -72,6 +73,11 @@ Usage: $0 [OPTIONS] + user. You must be root to use this option. By default + mysqld runs using your current login name and files and + directories that it creates will be owned by you. ++ --group=group_name The login group to use for running mysqld. Files and ++ directories created by mysqld will be owned by this ++ group. You must be root to use this option. By default ++ mysqld runs using your current group and files and ++ directories that it creates will be owned by you. + + All other options are passed to the mysqld program + +@@ -119,11 +125,11 @@ parse_arguments() + --builddir=*) builddir=`parse_arg "$arg"` ;; + --srcdir=*) srcdir=`parse_arg "$arg"` ;; + --ldata=*|--datadir=*|--data=*) ldata=`parse_arg "$arg"` ;; +- --user=*) + # Note that the user will be passed to mysqld so that it runs + # as 'user' (crucial e.g. if log-bin=/some_other_path/ + # where a chown of datadir won't help) +- user=`parse_arg "$arg"` ;; ++ --user=*) user=`parse_arg "$arg"` ;; ++ --group=*) group=`parse_arg "$arg"` ;; + --skip-name-resolve) ip_only=1 ;; + --verbose) verbose=1 ;; # Obsolete + --rpm) in_rpm=1 ;; +@@ -383,7 +389,12 @@ do + fi + if test -n "$user" + then +- chown $user $dir ++ if test -z "$group" ++ then ++ chown $user $dir ++ else ++ chown $user:$group $dir ++ fi + if test $? -ne 0 + then + echo "Cannot change ownership of the database directories to the '$user'" +@@ -398,6 +409,11 @@ then + args="$args --user=$user" + fi + ++if test -n "$group" ++then ++ args="$args --group=$group" ++fi ++ + # When doing a "cross bootstrap" install, no reference to the current + # host should be added to the system tables. So we filter out any + # lines which contain the current host name. +Index: scripts/CMakeLists.txt +=================================================================== +--- scripts/CMakeLists.txt.orig ++++ scripts/CMakeLists.txt +@@ -137,6 +137,7 @@ ENDIF() + + SET(HOSTNAME "hostname") + SET(MYSQLD_USER "mysql") ++SET(MYSQLD_GROUP "mysql") + + # Required for mysqlbug until autotools are deprecated, once done remove these + # and expand default cmake variables +Index: support-files/CMakeLists.txt +=================================================================== +--- support-files/CMakeLists.txt.orig ++++ support-files/CMakeLists.txt +@@ -28,6 +28,7 @@ ELSE() + SET(CFLAGS ${CMAKE_C_FLAGS}) + SET(CXXFLAGS ${CMAKE_CXX_FLAGS}) + SET(MYSQLD_USER "mysql") ++ SET(MYSQLD_GROUP "mysql") + SET(ini_file_extension "cnf") + SET(HOSTNAME "hostname") + ENDIF() diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/mysql-patches/mysql-patches/mysql-community-server-5.1.31-shebang.patch new/mysql-patches/mysql-patches/mysql-community-server-5.1.31-shebang.patch --- old/mysql-patches/mysql-patches/mysql-community-server-5.1.31-shebang.patch 2011-10-11 12:25:33.000000000 +0200 +++ new/mysql-patches/mysql-patches/mysql-community-server-5.1.31-shebang.patch 1970-01-01 01:00:00.000000000 +0100 @@ -1,30 +0,0 @@ -PATCH-P1-FIX-UPSTREAM: Adds shebangs - -Shebangs were missing at various places, so we are adding them. - -Maintainer: Michal Hrusecky <Michal.Hrusecky@opensuse.org> - -diff -Naru mysql-5.1.31-bak/mysql-test/t/long_tmpdir-master.sh mysql-5.1.31/mysql-test/t/long_tmpdir-master.sh ---- mysql-5.1.31-bak/mysql-test/t/long_tmpdir-master.sh 2009-02-23 17:18:48.000000000 +0100 -+++ mysql-5.1.31/mysql-test/t/long_tmpdir-master.sh 2009-02-24 17:57:42.000000000 +0100 -@@ -1,3 +1,4 @@ -+#!/bin/sh - d="$MYSQLTEST_VARDIR/tmp/long_temporary_directory_path_123456789_123456789_123456789_123456789_123456789_123456789_123456789_123456789" - test -d "$d" || mkdir "$d" - rm -f "$d"/* -diff -Naru mysql-5.1.31-bak/mysql-test/t/lowercase_mixed_tmpdir-master.sh mysql-5.1.31/mysql-test/t/lowercase_mixed_tmpdir-master.sh ---- mysql-5.1.31-bak/mysql-test/t/lowercase_mixed_tmpdir-master.sh 2009-02-23 17:18:48.000000000 +0100 -+++ mysql-5.1.31/mysql-test/t/lowercase_mixed_tmpdir-master.sh 2009-02-24 17:58:12.000000000 +0100 -@@ -1,3 +1,4 @@ -+#!/bin/sh - # This test requires a non-lowercase tmpdir directory on a case-sensitive - # filesystem. - -diff -Naru mysql-5.1.31-bak/sql-bench/graph-compare-results.sh mysql-5.1.31/sql-bench/graph-compare-results.sh ---- mysql-5.1.31-bak/sql-bench/graph-compare-results.sh 2009-02-23 17:18:49.000000000 +0100 -+++ mysql-5.1.31/sql-bench/graph-compare-results.sh 2009-02-24 18:00:16.000000000 +0100 -@@ -1,3 +1,4 @@ -+#/usr/bin/perl - #### - #### Hello ... this is a heavily hacked script by Luuk - #### instead of printing the result it makes a nice gif diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/mysql-patches/mysql-patches/mysql-community-server-5.1.33-ssl-lib64-macro.patch new/mysql-patches/mysql-patches/mysql-community-server-5.1.33-ssl-lib64-macro.patch --- old/mysql-patches/mysql-patches/mysql-community-server-5.1.33-ssl-lib64-macro.patch 2011-10-11 12:25:33.000000000 +0200 +++ new/mysql-patches/mysql-patches/mysql-community-server-5.1.33-ssl-lib64-macro.patch 1970-01-01 01:00:00.000000000 +0100 @@ -1,19 +0,0 @@ -PATCH-P0-HACK-UPSTREAM: Add lib64 dir to the library path - -On x86_64 systems openssl library is installed into /usr/lib64 directory and -MySQL couldn't find as it was searching only in /usr/lib. We can add it quite -safelly even on i586 as this directory wouldn't exist on them so no harm done. - -Maintainer: Michal Hrusecky <Michal.Hrusecky@opensuse.org> - ---- config/ac-macros/ssl.m4 2009-04-10 14:05:07.000000000 +0200 -+++ config/ac-macros/ssl.m4 2009-04-10 14:15:15.000000000 +0200 -@@ -102,7 +102,7 @@ - # - # Try to link with openSSL libs in <location> - # -- openssl_libs="-L$location/lib/ -lssl -lcrypto" -+ openssl_libs="-L$location/lib -L$location/lib64 -lssl -lcrypto" - MYSQL_CHECK_SSL_DIR([$openssl_includes], [$openssl_libs]) - - if test "$mysql_ssl_found" == "no" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/mysql-patches/mysql-patches/mysql-community-server-5.1.36-bmove512.patch new/mysql-patches/mysql-patches/mysql-community-server-5.1.36-bmove512.patch --- old/mysql-patches/mysql-patches/mysql-community-server-5.1.36-bmove512.patch 2011-10-11 12:25:33.000000000 +0200 +++ new/mysql-patches/mysql-patches/mysql-community-server-5.1.36-bmove512.patch 1970-01-01 01:00:00.000000000 +0100 @@ -1,47 +0,0 @@ -PATCH-P0-FEATURE-UPSTREAM: Better handling of memcpy -BUGS: upstream#19975 - -Standard memcpy should behave better then self made one. - -Maintainer: Michal Hrusecky <Michal.Hrusecky@opensuse.org> - -Index: mysys/mf_keycache.c -=================================================================== ---- mysys/mf_keycache.c.orig -+++ mysys/mf_keycache.c -@@ -2646,10 +2646,7 @@ uchar *key_cache_read(KEY_CACHE *keycach - #endif - - /* Copy data from the cache buffer */ -- if (!(read_length & 511)) -- bmove512(buff, block->buffer+offset, read_length); -- else -- memcpy(buff, block->buffer+offset, (size_t) read_length); -+ memcpy(buff, block->buffer+offset, (size_t) read_length); - - #if !defined(SERIALIZED_READ_FROM_CACHE) - keycache_pthread_mutex_lock(&keycache->cache_lock); -@@ -2857,10 +2854,7 @@ int key_cache_insert(KEY_CACHE *keycache - #endif - - /* Copy data from buff */ -- if (!(read_length & 511)) -- bmove512(block->buffer+offset, buff, read_length); -- else -- memcpy(block->buffer+offset, buff, (size_t) read_length); -+ memcpy(block->buffer+offset, buff, (size_t) read_length); - - #if !defined(SERIALIZED_READ_FROM_CACHE) - keycache_pthread_mutex_lock(&keycache->cache_lock); -@@ -3164,10 +3158,7 @@ int key_cache_write(KEY_CACHE *keycache, - #if !defined(SERIALIZED_READ_FROM_CACHE) - keycache_pthread_mutex_unlock(&keycache->cache_lock); - #endif -- if (!(read_length & 511)) -- bmove512(block->buffer+offset, buff, read_length); -- else -- memcpy(block->buffer+offset, buff, (size_t) read_length); -+ memcpy(block->buffer+offset, buff, (size_t) read_length); - - #if !defined(SERIALIZED_READ_FROM_CACHE) - keycache_pthread_mutex_lock(&keycache->cache_lock); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/mysql-patches/mysql-patches/mysql-community-server-5.1.53-ssl-compilation-fix.patch new/mysql-patches/mysql-patches/mysql-community-server-5.1.53-ssl-compilation-fix.patch --- old/mysql-patches/mysql-patches/mysql-community-server-5.1.53-ssl-compilation-fix.patch 2011-10-11 12:25:33.000000000 +0200 +++ new/mysql-patches/mysql-patches/mysql-community-server-5.1.53-ssl-compilation-fix.patch 1970-01-01 01:00:00.000000000 +0100 @@ -1,20 +0,0 @@ -PATCH-P0-FIX-UPSTREAM: Incompatible types in ssl - -Sometimes argument of this function can be const and function doesn't change -the variable so there is no reason not to make that argument const; - -Maintainer: Michal Hrusecky <Michal.Hrusecky@opensuse.org> - -Index: vio/viosslfactories.c -=================================================================== ---- vio/viosslfactories.c.orig -+++ vio/viosslfactories.c -@@ -198,7 +198,7 @@ static void check_ssl_init() - static struct st_VioSSLFd * - new_VioSSLFd(const char *key_file, const char *cert_file, - const char *ca_file, const char *ca_path, -- const char *cipher, SSL_METHOD *method, -+ const char *cipher, const SSL_METHOD *method, - enum enum_ssl_init_error* error) - { - DH *dh; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/mysql-patches/mysql-patches/mysql-community-server-5.5.6-safe-process-in-bin.patch new/mysql-patches/mysql-patches/mysql-community-server-5.5.6-safe-process-in-bin.patch --- old/mysql-patches/mysql-patches/mysql-community-server-5.5.6-safe-process-in-bin.patch 1970-01-01 01:00:00.000000000 +0100 +++ new/mysql-patches/mysql-patches/mysql-community-server-5.5.6-safe-process-in-bin.patch 2011-10-11 12:25:33.000000000 +0200 @@ -0,0 +1,29 @@ +PATCH-P0-FEATURE-SUSE: Moving SafeProcess to /usr/bin + +We prefer to have this script somewhere else, so we moved it out of +the mysql-test directory. + +Maintainer: Michal Hrusecky <Michal.Hrusecky@opensuse.org> + +Index: mysql-test/lib/My/SafeProcess.pm +=================================================================== +--- mysql-test/lib/My/SafeProcess.pm.orig ++++ mysql-test/lib/My/SafeProcess.pm +@@ -102,7 +102,7 @@ sub find_bin { + if (IS_WIN32PERL or IS_CYGWIN) + { + # Use my_safe_process.exe +- my $exe= my_find_bin($bindir, ["lib/My/SafeProcess", "My/SafeProcess"], ++ my $exe= my_find_bin($bindir, ["../../bin", "lib/My/SafeProcess", "My/SafeProcess"], + "my_safe_process"); + push(@safe_process_cmd, $exe); + +@@ -112,7 +112,7 @@ sub find_bin { + else + { + # Use my_safe_process +- my $exe= my_find_bin($bindir, ["lib/My/SafeProcess", "My/SafeProcess"], ++ my $exe= my_find_bin($bindir, ["../../bin", "lib/My/SafeProcess", "My/SafeProcess"], + "my_safe_process"); + push(@safe_process_cmd, $exe); + } ++++++ series ++++++ --- /var/tmp/diff_new_pack.RdzQn4/_old 2012-04-23 09:15:38.000000000 +0200 +++ /var/tmp/diff_new_pack.RdzQn4/_new 2012-04-23 09:15:38.000000000 +0200 @@ -1,21 +1,11 @@ -mysql-community-server-5.1.31-shebang.patch -mariadb-5.3.2-scripts-paths.patch -mysql-community-server-5.1.33-ssl-lib64-macro.patch -mysql-community-server-5.1.36-bmove512.patch mysql-community-server-5.1.36-hotcopy.patch -mariadb-5.2.6-group.patch mysql-community-server-5.1.45-multi-configuration.patch -mariadb-5.2.6-safe-process-in-bin.patch mysql-community-server-5.1.46-logrotate.patch mariadb-5.1.50-strncat-overflow.patch mariadb-5.2.6-install_db-quiet.patch -mariadb-5.3.3-myslq-test.patch mysql-community-server-5.1.51-mysql_config.patch mysql-community-server-5.1.51-mysqld_multi-features.patch -mariadb-5.3.2-plugins-avoid-version.patch mariadb-5.1.50-upgrade-exit-status.patch mariadb-5.2.3-cnf.patch -mariadb-5.2.4-libmysql-no-pkglibdir.patch -mysql-community-server-5.1.53-ssl-compilation-fix.patch -mariadb-5.3.3-compilation-fix.patch -mariadb-5.3.3-readline-includes.patch +mysql-community-server-5.5.6-safe-process-in-bin.patch +mariadb-5.5.20-group.patch -- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org