Hello community, here is the log from the commit of package mysql-community-server for openSUSE:Factory checked in at Mon May 23 15:55:23 CEST 2011. -------- --- mysql-community-server/mysql-community-server.changes 2011-05-11 12:32:15.000000000 +0200 +++ /mounts/work_src_done/STABLE/mysql-community-server/mysql-community-server.changes 2011-05-23 12:08:05.000000000 +0200 @@ -1,0 +2,5 @@ +Mon May 23 12:07:18 CEST 2011 - mhrusecky@suse.cz + +- enable creation of libraries and devel packages + +------------------------------------------------------------------- calling whatdependson for head-i586 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ mysql-community-server.spec ++++++ --- /var/tmp/diff_new_pack.0gtNXv/_old 2011-05-23 15:54:09.000000000 +0200 +++ /var/tmp/diff_new_pack.0gtNXv/_new 2011-05-23 15:54:09.000000000 +0200 @@ -18,7 +18,7 @@ # norootforbuild # Few definitions which will alter build -%define prefered 0 +%define prefered 1 %define use_cmake 1 %define cluster 0 %define builtin_plugins partition,csv,heap,myisam,innobase @@ -33,7 +33,7 @@ Name: mysql-community-server Summary: A True Multiuser, Multithreaded SQL Database Server Version: 5.5.12 -Release: 1 +Release: 3 %define srv_vers 5.5.12 License: GPLv2 ; with additional permissions: EXCEPTIONS-CLIENT Group: Productivity/Databases/Servers @@ -138,13 +138,13 @@ David Axmark <davida@mysql.com> #------------------------------------------------------------------------------- -%package -n libmysqld0 +%package -n libmysqld18 #------------------------------------------------------------------------------- License: GPLv2 ; with additional permissions: EXCEPTIONS-CLIENT Summary: MySQL embedded server development files Group: Development/Libraries/C and C++ -%description -n libmysqld0 +%description -n libmysqld18 This package contains the development header files and libraries for developing application that embed the MySQL server @@ -156,7 +156,7 @@ Summary: MySQL embedded server development files # the headers files are the shared Requires: libmysqlclient-devel = %version tcpd-devel -Requires: libmysqld0 = %version +Requires: libmysqld18 = %version Group: Development/Libraries/C and C++ %description -n libmysqld-devel @@ -504,14 +504,14 @@ %if 0%{prefered} > 0 #------------------------------------------------------------------------------- -%post -n libmysqld0 +%post -n libmysqld18 #------------------------------------------------------------------------------- /sbin/ldconfig #------------------------------------------------------------------------------- #------------------------------------------------------------------------------- -%postun -n libmysqld0 +%postun -n libmysqld18 #------------------------------------------------------------------------------- /sbin/ldconfig #------------------------------------------------------------------------------- @@ -587,7 +587,7 @@ #------------------------------------------------------------------------------- -%files -n libmysqld0 +%files -n libmysqld18 #------------------------------------------------------------------------------- %defattr(-,root,root) %_libdir/libmysqld.so.* ++++++ build.inc ++++++ --- /var/tmp/diff_new_pack.0gtNXv/_old 2011-05-23 15:54:09.000000000 +0200 +++ /var/tmp/diff_new_pack.0gtNXv/_new 2011-05-23 15:54:09.000000000 +0200 @@ -109,4 +109,5 @@ BuildMySQL "" -DCMAKE_BUILD_TYPE=Release -DINSTALL_SQLBENCHDIR=share BuildMySQL "-debug" -DCMAKE_BUILD_TYPE=Debug + %endif ++++++ install.inc ++++++ --- /var/tmp/diff_new_pack.0gtNXv/_old 2011-05-23 15:54:09.000000000 +0200 +++ /var/tmp/diff_new_pack.0gtNXv/_new 2011-05-23 15:54:09.000000000 +0200 @@ -9,6 +9,7 @@ install -m 644 _build/sql/mysqld.sym %buildroot%_libdir/mysql/mysqld.sym # remove most static libs (FIXME: don't build them at all...) rm -f %buildroot%_libdir/libmysqlclient*a +rm -f %buildroot%_libdir/libmysqlservices*a rm -f %buildroot%_libdir/mysql/*.a %buildroot%_libdir/mysql/*.la rm -f %buildroot%_libdir/mysql/plugin/*a # XXX: package these? The ndb tools are linked statically atm @@ -58,7 +59,7 @@ install -d -m 755 %buildroot/etc/logrotate.d install -d -m 755 %buildroot/etc/init.d install -m 644 _build/support-files/mysql-log-rotate %buildroot/etc/logrotate.d/mysql -%if 0%{?prefered} > 0 +%if 0%{?prefered} > 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 ++++++ mysql-patches.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/mysql-patches/mysql-patches/mysql-community-server-5.1.30-federated-workaround.patch new/mysql-patches/mysql-patches/mysql-community-server-5.1.30-federated-workaround.patch --- old/mysql-patches/mysql-patches/mysql-community-server-5.1.30-federated-workaround.patch 1970-01-01 01:00:00.000000000 +0100 +++ new/mysql-patches/mysql-patches/mysql-community-server-5.1.30-federated-workaround.patch 2010-12-23 16:09:10.000000000 +0100 @@ -0,0 +1,22 @@ +PATCH-P0-HACK-UPSTREAM: Make federated plugin to compile + +Really ugly way to force federated plugin to compile if it is choosed to be +dynamically loadable. + +Maintainer: Michal Hrusecky <Michal.Hrusecky@opensuse.org> + +--- storage/federated/ha_federated.cc ++++ storage/federated/ha_federated.cc +@@ -385,6 +385,12 @@ + + #include <mysql/plugin.h> + ++ ++// Quick and ugly plugin workaround ++#ifdef MYSQL_DYNAMIC_PLUGIN ++#include "../../mysys/string.c" ++#endif ++ + /* Variables for federated share methods */ + static HASH federated_open_tables; // To track open tables + pthread_mutex_t federated_mutex; // To init the hash diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/mysql-patches/mysql-patches/mysql-community-server-5.1.33-scripts-paths.patch new/mysql-patches/mysql-patches/mysql-community-server-5.1.33-scripts-paths.patch --- old/mysql-patches/mysql-patches/mysql-community-server-5.1.33-scripts-paths.patch 1970-01-01 01:00:00.000000000 +0100 +++ new/mysql-patches/mysql-patches/mysql-community-server-5.1.33-scripts-paths.patch 2010-12-23 16:09:10.000000000 +0100 @@ -0,0 +1,27 @@ +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> + +--- scripts/Makefile.am 2009-04-02 18:29:00.292563355 +0200 ++++ scripts/Makefile.am 2009-04-02 18:21:50.462559739 +0200 +@@ -110,7 +110,7 @@ + mysql_fix_privilege_tables.sql: mysql_system_tables.sql \ + mysql_system_tables_fix.sql + @echo "Building $@"; +- @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 +@@ -123,7 +123,7 @@ + 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/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 1970-01-01 01:00:00.000000000 +0100 +++ new/mysql-patches/mysql-patches/mysql-community-server-5.1.33-ssl-lib64-macro.patch 2010-12-23 16:09:10.000000000 +0100 @@ -0,0 +1,19 @@ +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 1970-01-01 01:00:00.000000000 +0100 +++ new/mysql-patches/mysql-patches/mysql-community-server-5.1.36-bmove512.patch 2010-12-23 16:09:10.000000000 +0100 @@ -0,0 +1,47 @@ +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.45-cnf.patch new/mysql-patches/mysql-patches/mysql-community-server-5.1.45-cnf.patch --- old/mysql-patches/mysql-patches/mysql-community-server-5.1.45-cnf.patch 1970-01-01 01:00:00.000000000 +0100 +++ new/mysql-patches/mysql-patches/mysql-community-server-5.1.45-cnf.patch 2010-12-23 16:09:10.000000000 +0100 @@ -0,0 +1,96 @@ +PATCH-P0-FIX-SUSE: Tweak default configuration + +This patch adds log file locations and socket location as they should be in +SuSE to the default configuration files. + +Maintainer: Michal Hrusecky <Michal.Hrusecky@opensuse.org> + +Index: support-files/my-huge.cnf.sh +=================================================================== +--- support-files/my-huge.cnf.sh.orig ++++ support-files/my-huge.cnf.sh +@@ -131,7 +131,15 @@ server-id = 1 + #innodb_flush_log_at_trx_commit = 1 + #innodb_lock_wait_timeout = 50 + ++# The safe_mysqld script ++[safe_mysqld] ++log-error=/var/log/mysql/mysqld.log ++socket = @MYSQL_UNIX_ADDR@ ++ ++!include_dir /etc/mysql ++ + [mysqldump] ++socket = @MYSQL_UNIX_ADDR@ + quick + max_allowed_packet = 16M + +Index: support-files/my-large.cnf.sh +=================================================================== +--- support-files/my-large.cnf.sh.orig ++++ support-files/my-large.cnf.sh +@@ -131,7 +131,15 @@ server-id = 1 + #innodb_flush_log_at_trx_commit = 1 + #innodb_lock_wait_timeout = 50 + ++# The safe_mysqld script ++[safe_mysqld] ++log-error=/var/log/mysql/mysqld.log ++socket = @MYSQL_UNIX_ADDR@ ++ ++!include_dir /etc/mysql ++ + [mysqldump] ++socket = @MYSQL_UNIX_ADDR@ + quick + max_allowed_packet = 16M + +Index: support-files/my-medium.cnf.sh +=================================================================== +--- support-files/my-medium.cnf.sh.orig ++++ support-files/my-medium.cnf.sh +@@ -26,6 +26,8 @@ socket = @MYSQL_UNIX_ADDR@ + [mysqld] + port = @MYSQL_TCP_PORT@ + socket = @MYSQL_UNIX_ADDR@ ++# Change following line if you want to store your database elsewhere ++datadir = /var/lib/mysql + skip-locking + key_buffer_size = 16M + max_allowed_packet = 1M +@@ -129,7 +131,15 @@ server-id = 1 + #innodb_flush_log_at_trx_commit = 1 + #innodb_lock_wait_timeout = 50 + ++# The safe_mysqld script ++[safe_mysqld] ++log-error = /var/log/mysql/mysqld.log ++socket = @MYSQL_UNIX_ADDR@ ++ ++!include_dir /etc/mysql ++ + [mysqldump] ++socket = @MYSQL_UNIX_ADDR@ + quick + max_allowed_packet = 16M + +Index: support-files/my-small.cnf.sh +=================================================================== +--- support-files/my-small.cnf.sh.orig ++++ support-files/my-small.cnf.sh +@@ -65,7 +65,15 @@ server-id = 1 + #innodb_flush_log_at_trx_commit = 1 + #innodb_lock_wait_timeout = 50 + ++# The safe_mysqld script ++[safe_mysqld] ++log-error = /var/log/mysql/mysqld.log ++socket = @MYSQL_UNIX_ADDR@ ++ ++!include_dir /etc/mysql ++ + [mysqldump] ++socket = @MYSQL_UNIX_ADDR@ + quick + max_allowed_packet = 16M + diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/mysql-patches/mysql-patches/mysql-community-server-5.1.45-group.patch new/mysql-patches/mysql-patches/mysql-community-server-5.1.45-group.patch --- old/mysql-patches/mysql-patches/mysql-community-server-5.1.45-group.patch 1970-01-01 01:00:00.000000000 +0100 +++ new/mysql-patches/mysql-patches/mysql-community-server-5.1.45-group.patch 2010-12-23 16:09:10.000000000 +0100 @@ -0,0 +1,155 @@ +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 <Michal.Hrusecky@opensuse.org> + +Index: configure.in +=================================================================== +--- configure.in.orig ++++ configure.in +@@ -793,6 +793,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 +@@ -185,6 +185,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=*) DATADIR="$val" ;; + --pid-file=*) pid_file="$val" ;; + --user=*) user="$val"; SET_USER=1 ;; ++ --group=*) group="$val"; SET_USER=1 ;; + + # these might have been set in a [mysqld_safe] section of my.cnf + # they are added to mysqld command line to override settings from my.cnf +@@ -388,11 +390,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 +@@ -407,7 +415,12 @@ mysql_unix_port_dir=`dirname $safe_mysql + if [ ! -d $mysql_unix_port_dir ] + then + mkdir $mysql_unix_port_dir +- 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 +@@ -63,6 +64,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 + +@@ -103,11 +109,11 @@ parse_arguments() + --builddir=*) builddir=`parse_arg "$arg"` ;; + --srcdir=*) srcdir=`parse_arg "$arg"` ;; + --ldata=*|--datadir=*) 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 ;; +@@ -360,7 +366,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 + +@@ -369,6 +380,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/mysql-community-server-5.1.45-safe-process-in-bin.patch new/mysql-patches/mysql-patches/mysql-community-server-5.1.45-safe-process-in-bin.patch --- old/mysql-patches/mysql-patches/mysql-community-server-5.1.45-safe-process-in-bin.patch 1970-01-01 01:00:00.000000000 +0100 +++ new/mysql-patches/mysql-patches/mysql-community-server-5.1.45-safe-process-in-bin.patch 2010-12-23 16:09:10.000000000 +0100 @@ -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 +@@ -89,7 +89,7 @@ sub find_bin { + if (IS_WIN32PERL or IS_CYGWIN) + { + # Use my_safe_process.exe +- my $exe= my_find_bin(".", ["lib/My/SafeProcess", "My/SafeProcess"], ++ my $exe= my_find_bin(".", ["../../bin", "lib/My/SafeProcess", "My/SafeProcess"], + "my_safe_process"); + push(@safe_process_cmd, $exe); + +@@ -99,7 +99,7 @@ sub find_bin { + else + { + # Use my_safe_process +- my $exe= my_find_bin(".", ["lib/My/SafeProcess", "My/SafeProcess"], ++ my $exe= my_find_bin(".", ["../../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/mysql-community-server-5.1.50-strncat-overflow.patch new/mysql-patches/mysql-patches/mysql-community-server-5.1.50-strncat-overflow.patch --- old/mysql-patches/mysql-patches/mysql-community-server-5.1.50-strncat-overflow.patch 1970-01-01 01:00:00.000000000 +0100 +++ new/mysql-patches/mysql-patches/mysql-community-server-5.1.50-strncat-overflow.patch 2010-12-23 16:09:10.000000000 +0100 @@ -0,0 +1,20 @@ +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 <Michal.Hrusecky@opensuse.org> + +Index: mysys/mf_loadpath.c +=================================================================== +--- mysys/mf_loadpath.c.orig ++++ mysys/mf_loadpath.c +@@ -42,7 +42,7 @@ char * my_load_path(char * to, const cha + if (is_cur) + is_cur=2; /* Remove current dir */ + if (! my_getwd(buff,(uint) (FN_REFLEN-strlen(path)+is_cur),MYF(0))) +- VOID(strncat(buff, path+is_cur, FN_REFLEN-1)); ++ VOID(strncat(buff, path+is_cur, FN_REFLEN-strlen(buff)-1)); + else + VOID(strnmov(buff, path, FN_REFLEN)); /* Return org file name */ + } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/mysql-patches/mysql-patches/mysql-community-server-5.1.51-libmysql-no-pkglibdir.patch new/mysql-patches/mysql-patches/mysql-community-server-5.1.51-libmysql-no-pkglibdir.patch --- old/mysql-patches/mysql-patches/mysql-community-server-5.1.51-libmysql-no-pkglibdir.patch 1970-01-01 01:00:00.000000000 +0100 +++ new/mysql-patches/mysql-patches/mysql-community-server-5.1.51-libmysql-no-pkglibdir.patch 2010-12-23 16:09:10.000000000 +0100 @@ -0,0 +1,32 @@ +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 +@@ -26,7 +26,7 @@ MYSQLBASEdir= $(prefix) + ## 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@ + + noinst_LIBRARIES = libmysqld_int.a +-pkglib_LIBRARIES = libmysqld.a ++lib_LIBRARIES = libmysqld.a + 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/mysql-community-server-5.1.51-plugins-avoid-version.patch new/mysql-patches/mysql-patches/mysql-community-server-5.1.51-plugins-avoid-version.patch --- old/mysql-patches/mysql-patches/mysql-community-server-5.1.51-plugins-avoid-version.patch 1970-01-01 01:00:00.000000000 +0100 +++ new/mysql-patches/mysql-patches/mysql-community-server-5.1.51-plugins-avoid-version.patch 2010-12-23 16:15:03.000000000 +0100 @@ -0,0 +1,71 @@ +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 = 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=$(AM_CXXFLAGS) -DMYSQL_DYNAMIC_PLUGIN + ha_blackhole_la_CFLAGS= $(AM_CFLAGS) -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 = 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= $(AM_CXXFLAGS) -DMYSQL_DYNAMIC_PLUGIN + ha_archive_la_CFLAGS = $(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 = ha_example.la + pkgplugin_LTLIBRARIES = @plugin_example_shared_target@ +-ha_example_la_LDFLAGS = -module -rpath $(pkgplugindir) ++ha_example_la_LDFLAGS = -module -avoid-version -rpath $(pkgplugindir) + ha_example_la_CXXFLAGS= $(AM_CXXFLAGS) -DMYSQL_DYNAMIC_PLUGIN + ha_example_la_CFLAGS = $(AM_CFLAGS) -DMYSQL_DYNAMIC_PLUGIN + ha_example_la_SOURCES = ha_example.cc +Index: storage/federated/Makefile.am +=================================================================== +--- storage/federated/Makefile.am.orig ++++ storage/federated/Makefile.am +@@ -34,7 +34,7 @@ noinst_HEADERS = ha_federated.h + + EXTRA_LTLIBRARIES = ha_federated.la + pkgplugin_LTLIBRARIES = @plugin_federated_shared_target@ +-ha_federated_la_LDFLAGS = -module -rpath $(pkgplugindir) ++ha_federated_la_LDFLAGS = -module -avoid-version -rpath $(pkgplugindir) + ha_federated_la_CXXFLAGS= $(AM_CXXFLAGS) -DMYSQL_DYNAMIC_PLUGIN + ha_federated_la_CFLAGS = $(AM_CFLAGS) -DMYSQL_DYNAMIC_PLUGIN + ha_federated_la_SOURCES = ha_federated.cc +Index: storage/innodb_plugin/Makefile.am +=================================================================== +--- storage/innodb_plugin/Makefile.am.orig ++++ storage/innodb_plugin/Makefile.am +@@ -331,7 +331,7 @@ libinnobase_a_CFLAGS= $(AM_CFLAGS) + EXTRA_LTLIBRARIES= ha_innodb_plugin.la + pkgplugin_LTLIBRARIES= @plugin_innodb_plugin_shared_target@ + +-ha_innodb_plugin_la_LDFLAGS= -module -rpath $(pkgplugindir) ++ha_innodb_plugin_la_LDFLAGS= -module -avoid-version -rpath $(pkgplugindir) + ha_innodb_plugin_la_CXXFLAGS= $(AM_CXXFLAGS) $(INNODB_DYNAMIC_CFLAGS) + ha_innodb_plugin_la_CFLAGS= $(AM_CFLAGS) $(INNODB_DYNAMIC_CFLAGS) + ha_innodb_plugin_la_SOURCES= $(libinnobase_a_SOURCES) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/mysql-patches/mysql-patches/mysql-community-server-5.1.52-utf8-test-results.patch new/mysql-patches/mysql-patches/mysql-community-server-5.1.52-utf8-test-results.patch --- old/mysql-patches/mysql-patches/mysql-community-server-5.1.52-utf8-test-results.patch 1970-01-01 01:00:00.000000000 +0100 +++ new/mysql-patches/mysql-patches/mysql-community-server-5.1.52-utf8-test-results.patch 2010-12-23 16:09:10.000000000 +0100 @@ -0,0 +1,103 @@ +PATCH-P0-FIX-SUSE: Fix test results confused by utf-8 + +We are using utf-8 as a default charset during the compilation and it has some +effect on the test results. Correct sollution would be to make these results +charset independent, but easiest one is obviously to modify them to reflect our +default settings. + +Maintainer: Michal Hrusecky <Michal.Hrusecky@opensuse.org> + +Index: mysql-test/r/information_schema.result +=================================================================== +--- mysql-test/r/information_schema.result.orig ++++ mysql-test/r/information_schema.result +@@ -9,7 +9,7 @@ create user mysqltest_3@localhost; + create user mysqltest_3; + select * from information_schema.SCHEMATA where schema_name > 'm'; + CATALOG_NAME SCHEMA_NAME DEFAULT_CHARACTER_SET_NAME DEFAULT_COLLATION_NAME SQL_PATH +-NULL mtr latin1 latin1_swedish_ci NULL ++NULL mtr utf8 utf8_unicode_ci NULL + NULL mysql latin1 latin1_swedish_ci NULL + NULL test latin1 latin1_swedish_ci NULL + select schema_name from information_schema.schemata; +Index: mysql-test/r/mysql_comments.result +=================================================================== +--- mysql-test/r/mysql_comments.result.orig ++++ mysql-test/r/mysql_comments.result +@@ -13,23 +13,23 @@ drop trigger if exists t1_bi; + foofct("call 1") + call 1 + Function sql_mode Create Function character_set_client collation_connection Database Collation +-foofct CREATE DEFINER=`root`@`localhost` FUNCTION `foofct`(x char(20)) RETURNS char(20) CHARSET latin1\nreturn\n\n\n\nx latin1 latin1_swedish_ci latin1_swedish_ci ++foofct CREATE DEFINER=`root`@`localhost` FUNCTION `foofct`(x char(20)) RETURNS char(20) CHARSET latin1\nreturn\n\n\n\nx utf8 utf8_unicode_ci latin1_swedish_ci + foofct("call 2") + call 2 + Function sql_mode Create Function character_set_client collation_connection Database Collation +-foofct CREATE DEFINER=`root`@`localhost` FUNCTION `foofct`(x char(20)) RETURNS char(20) CHARSET latin1\nbegin\n \n \n \n\n \n\n \n return x;\nend latin1 latin1_swedish_ci latin1_swedish_ci ++foofct CREATE DEFINER=`root`@`localhost` FUNCTION `foofct`(x char(20)) RETURNS char(20) CHARSET latin1\nbegin\n \n \n \n\n \n\n \n return x;\nend utf8 utf8_unicode_ci latin1_swedish_ci + Procedure sql_mode Create Procedure character_set_client collation_connection Database Collation +-empty CREATE DEFINER=`root`@`localhost` PROCEDURE `empty`()\nbegin\nend latin1 latin1_swedish_ci latin1_swedish_ci ++empty CREATE DEFINER=`root`@`localhost` PROCEDURE `empty`()\nbegin\nend utf8 utf8_unicode_ci latin1_swedish_ci + id data + foo 42 + Procedure sql_mode Create Procedure character_set_client collation_connection Database Collation +-foosp CREATE DEFINER=`root`@`localhost` PROCEDURE `foosp`()\ninsert into test.t1\n\n\n\n\n \n\n \n values ("foo", 42) latin1 latin1_swedish_ci latin1_swedish_ci ++foosp CREATE DEFINER=`root`@`localhost` PROCEDURE `foosp`()\ninsert into test.t1\n\n\n\n\n \n\n \n values ("foo", 42) utf8 utf8_unicode_ci latin1_swedish_ci + Procedure sql_mode Create Procedure character_set_client collation_connection Database Collation +-nicesp CREATE DEFINER=`root`@`localhost` PROCEDURE `nicesp`(a int)\nbegin\n \n declare b int;\n declare c float;\n\n \n \n\n \nend latin1 latin1_swedish_ci latin1_swedish_ci ++nicesp CREATE DEFINER=`root`@`localhost` PROCEDURE `nicesp`(a int)\nbegin\n \n declare b int;\n declare c float;\n\n \n \n\n \nend utf8 utf8_unicode_ci latin1_swedish_ci + Trigger sql_mode SQL Original Statement character_set_client collation_connection Database Collation +-t1_empty CREATE DEFINER=`root`@`localhost` trigger t1_empty after delete on t1\nfor each row\nbegin\nend latin1 latin1_swedish_ci latin1_swedish_ci ++t1_empty CREATE DEFINER=`root`@`localhost` trigger t1_empty after delete on t1\nfor each row\nbegin\nend utf8 utf8_unicode_ci latin1_swedish_ci + Trigger sql_mode SQL Original Statement character_set_client collation_connection Database Collation +-t1_bi CREATE DEFINER=`root`@`localhost` trigger t1_bi before insert on t1\nfor each row\nbegin\n\n\n\n \n declare b int;\n declare c float;\n\n \n \n\n \n set NEW.data := 12;\nend latin1 latin1_swedish_ci latin1_swedish_ci ++t1_bi CREATE DEFINER=`root`@`localhost` trigger t1_bi before insert on t1\nfor each row\nbegin\n\n\n\n \n declare b int;\n declare c float;\n\n \n \n\n \n set NEW.data := 12;\nend utf8 utf8_unicode_ci latin1_swedish_ci + id data + trig 12 + "Pass 2 : --enable-comments" +@@ -40,23 +40,23 @@ trig 12 + foofct("call 1") + call 1 + Function sql_mode Create Function character_set_client collation_connection Database Collation +-foofct CREATE DEFINER=`root`@`localhost` FUNCTION `foofct`(x char(20)) RETURNS char(20) CHARSET latin1\nreturn\n-- comment 1a\n# comment 1b\n/* comment 1c */\nx # after body, on same line latin1 latin1_swedish_ci latin1_swedish_ci ++foofct CREATE DEFINER=`root`@`localhost` FUNCTION `foofct`(x char(20)) RETURNS char(20) CHARSET latin1\nreturn\n-- comment 1a\n# comment 1b\n/* comment 1c */\nx # after body, on same line utf8 utf8_unicode_ci latin1_swedish_ci + foofct("call 2") + call 2 + Function sql_mode Create Function character_set_client collation_connection Database Collation +-foofct CREATE DEFINER=`root`@`localhost` FUNCTION `foofct`(x char(20)) RETURNS char(20) CHARSET latin1\nbegin\n -- comment 1a\n # comment 1b\n /*\n comment 1c\n */\n\n -- empty line below\n\n -- empty line above\n return x;\nend latin1 latin1_swedish_ci latin1_swedish_ci ++foofct CREATE DEFINER=`root`@`localhost` FUNCTION `foofct`(x char(20)) RETURNS char(20) CHARSET latin1\nbegin\n -- comment 1a\n # comment 1b\n /*\n comment 1c\n */\n\n -- empty line below\n\n -- empty line above\n return x;\nend utf8 utf8_unicode_ci latin1_swedish_ci + Procedure sql_mode Create Procedure character_set_client collation_connection Database Collation +-empty CREATE DEFINER=`root`@`localhost` PROCEDURE `empty`()\nbegin\nend latin1 latin1_swedish_ci latin1_swedish_ci ++empty CREATE DEFINER=`root`@`localhost` PROCEDURE `empty`()\nbegin\nend utf8 utf8_unicode_ci latin1_swedish_ci + id data + foo 42 + Procedure sql_mode Create Procedure character_set_client collation_connection Database Collation +-foosp CREATE DEFINER=`root`@`localhost` PROCEDURE `foosp`()\ninsert into test.t1\n## These comments are part of the procedure body, and should be kept.\n# Comment 2a\n-- Comment 2b\n/* Comment 2c */\n -- empty line below\n\n -- empty line above\n values ("foo", 42) # comment 3, still part of the body latin1 latin1_swedish_ci latin1_swedish_ci ++foosp CREATE DEFINER=`root`@`localhost` PROCEDURE `foosp`()\ninsert into test.t1\n## These comments are part of the procedure body, and should be kept.\n# Comment 2a\n-- Comment 2b\n/* Comment 2c */\n -- empty line below\n\n -- empty line above\n values ("foo", 42) # comment 3, still part of the body utf8 utf8_unicode_ci latin1_swedish_ci + Procedure sql_mode Create Procedure character_set_client collation_connection Database Collation +-nicesp CREATE DEFINER=`root`@`localhost` PROCEDURE `nicesp`(a int)\nbegin\n -- declare some variables here\n declare b int;\n declare c float;\n\n -- do more stuff here\n -- commented nicely and so on\n\n -- famous last words ...\nend latin1 latin1_swedish_ci latin1_swedish_ci ++nicesp CREATE DEFINER=`root`@`localhost` PROCEDURE `nicesp`(a int)\nbegin\n -- declare some variables here\n declare b int;\n declare c float;\n\n -- do more stuff here\n -- commented nicely and so on\n\n -- famous last words ...\nend utf8 utf8_unicode_ci latin1_swedish_ci + Trigger sql_mode SQL Original Statement character_set_client collation_connection Database Collation +-t1_empty CREATE DEFINER=`root`@`localhost` trigger t1_empty after delete on t1\nfor each row\nbegin\nend latin1 latin1_swedish_ci latin1_swedish_ci ++t1_empty CREATE DEFINER=`root`@`localhost` trigger t1_empty after delete on t1\nfor each row\nbegin\nend utf8 utf8_unicode_ci latin1_swedish_ci + Trigger sql_mode SQL Original Statement character_set_client collation_connection Database Collation +-t1_bi CREATE DEFINER=`root`@`localhost` trigger t1_bi before insert on t1\nfor each row\nbegin\n# comment 1a\n-- comment 1b\n/*\n comment 1c\n*/\n -- declare some variables here\n declare b int;\n declare c float;\n\n -- do more stuff here\n -- commented nicely and so on\n\n -- famous last words ...\n set NEW.data := 12;\nend latin1 latin1_swedish_ci latin1_swedish_ci ++t1_bi CREATE DEFINER=`root`@`localhost` trigger t1_bi before insert on t1\nfor each row\nbegin\n# comment 1a\n-- comment 1b\n/*\n comment 1c\n*/\n -- declare some variables here\n declare b int;\n declare c float;\n\n -- do more stuff here\n -- commented nicely and so on\n\n -- famous last words ...\n set NEW.data := 12;\nend utf8 utf8_unicode_ci latin1_swedish_ci + id data + trig 12 + End of 5.0 tests +Index: mysql-test/r/mysql_upgrade.result +=================================================================== +--- mysql-test/r/mysql_upgrade.result.orig ++++ mysql-test/r/mysql_upgrade.result +@@ -166,8 +166,8 @@ mysql.time_zone_transition_type + mysql.user OK + CALL testproc(); + DROP PROCEDURE testproc; +-WARNING: NULL values of the 'character_set_client' column ('mysql.proc' table) have been updated with a default value (latin1). Please verify if necessary. +-WARNING: NULL values of the 'collation_connection' column ('mysql.proc' table) have been updated with a default value (latin1_swedish_ci). Please verify if necessary. ++WARNING: NULL values of the 'character_set_client' column ('mysql.proc' table) have been updated with a default value (utf8). Please verify if necessary. ++WARNING: NULL values of the 'collation_connection' column ('mysql.proc' table) have been updated with a default value (utf8_unicode_ci). Please verify if necessary. + WARNING: NULL values of the 'db_collation' column ('mysql.proc' table) have been updated with default values. Please verify if necessary. + # + # Bug #53613: mysql_upgrade incorrectly revokes diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/mysql-patches/mysql-patches/mysql-community-server-5.1.56-compilation-fix.patch new/mysql-patches/mysql-patches/mysql-community-server-5.1.56-compilation-fix.patch --- old/mysql-patches/mysql-patches/mysql-community-server-5.1.56-compilation-fix.patch 1970-01-01 01:00:00.000000000 +0100 +++ new/mysql-patches/mysql-patches/mysql-community-server-5.1.56-compilation-fix.patch 2011-05-06 20:33:26.000000000 +0200 @@ -0,0 +1,174 @@ +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 +@@ -55,7 +55,7 @@ LINE_BUFFER *batch_readline_init(ulong m + char *batch_readline(LINE_BUFFER *line_buff) + { + char *pos; +- ulong out_length; ++ ulong out_length=0; + + if (!(pos=intern_read_line(line_buff, &out_length))) + return 0; +Index: storage/innobase/ut/ut0ut.c +=================================================================== +--- storage/innobase/ut/ut0ut.c.orig ++++ storage/innobase/ut/ut0ut.c +@@ -495,7 +495,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"); ++ } + } + + /************************************************************************** +@@ -516,7 +518,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/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 +@@ -1854,7 +1854,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 +@@ -438,16 +438,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 +@@ -11344,7 +11344,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 +@@ -11355,7 +11356,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/sql_table.cc +=================================================================== +--- sql/sql_table.cc.orig ++++ sql/sql_table.cc +@@ -6955,7 +6955,7 @@ view_err: + need_copy_table= ALTER_TABLE_DATA_CHANGED; + else + { +- enum_alter_table_change_level need_copy_table_res; ++ enum_alter_table_change_level need_copy_table_res = ALTER_TABLE_DATA_CHANGED; + /* Check how much the tables differ. */ + if (compare_tables(table, alter_info, + create_info, order_num, +Index: sql/debug_sync.cc +=================================================================== +--- sql/debug_sync.cc.orig ++++ sql/debug_sync.cc +@@ -1721,6 +1721,7 @@ static void debug_sync_execute(THD *thd, + const char *UNINIT_VAR(old_proc_info); + + action->execute--; ++ old_proc_info = NULL; + + /* + If we will be going to wait, set proc_info for the PROCESSLIST table. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/mysql-patches/mysql-patches/mysql-community-server-5.5.12-shared-libmysqld.patch new/mysql-patches/mysql-patches/mysql-community-server-5.5.12-shared-libmysqld.patch --- old/mysql-patches/mysql-patches/mysql-community-server-5.5.12-shared-libmysqld.patch 1970-01-01 01:00:00.000000000 +0100 +++ new/mysql-patches/mysql-patches/mysql-community-server-5.5.12-shared-libmysqld.patch 2011-05-23 11:33:28.000000000 +0200 @@ -0,0 +1,54 @@ +PATCH-P0-FIX-UPSTREAM: Generate shared libmysqld + +In Linux distributions, we love shared libraries and we want to link gainst +shared libraries. As libmysqld library is used for example by Amarok, we want +this library to be shared. + +Maintainer: Michal Hrusecky <Michal.Hrusecky@opensuse.org> + +Index: libmysqld/CMakeLists.txt +=================================================================== +--- libmysqld/CMakeLists.txt.orig ++++ libmysqld/CMakeLists.txt +@@ -138,7 +138,17 @@ IF(UNIX) + ${CMAKE_STATIC_LIBRARY_PREFIX}mysqld-debug) + ENDIF() + +-IF(MSVC AND NOT DISABLE_SHARED) +- MERGE_LIBRARIES(libmysqld SHARED ${LIBS} EXPORTS ${CLIENT_API_FUNCTIONS} +- COMPONENT Embedded) ++IF(NOT DISABLE_SHARED) ++ MERGE_LIBRARIES(libmysqld SHARED mysqlserver EXPORTS ${CLIENT_API_FUNCTIONS}) ++ IF(UNIX) ++ # Name the shared library, handle versioning (provides same api as client library ++ # hence the same version) ++ SET_TARGET_PROPERTIES(libmysqld PROPERTIES ++ OUTPUT_NAME mysqld ++ VERSION "${SHARED_LIB_MAJOR_VERSION}.0.0" ++ SOVERSION "${SHARED_LIB_MAJOR_VERSION}") ++ # Clean direct output flags, as 2 targets have the same base name (libmysqld) ++ SET_TARGET_PROPERTIES(libmysqld PROPERTIES CLEAN_DIRECT_OUTPUT 1) ++ SET_TARGET_PROPERTIES(mysqlserver PROPERTIES CLEAN_DIRECT_OUTPUT 1) ++ ENDIF() + ENDIF() +Index: cmake/libutils.cmake +=================================================================== +--- cmake/libutils.cmake.orig ++++ cmake/libutils.cmake +@@ -268,6 +268,16 @@ MACRO(MERGE_LIBRARIES) + MYSQL_INSTALL_TARGETS(${TARGET} DESTINATION "${INSTALL_LIBDIR}" ${COMP}) + ENDIF() + SET_TARGET_PROPERTIES(${TARGET} PROPERTIES LINK_INTERFACE_LIBRARIES "") ++ ++ IF(ARG_SHARED AND LINK_FLAG_NO_UNDEFINED) ++ # Do not allow undefined symbols in shared libraries ++ GET_TARGET_PROPERTY(TARGET_LINK_FLAGS ${TARGET} LINK_FLAGS) ++ IF(NOT TARGET_LINK_FLAGS) ++ SET(TARGET_LINK_FLAGS) ++ ENDIF() ++ SET_TARGET_PROPERTIES(${TARGET} PROPERTIES LINK_FLAGS ++ "${TARGET_LINK_FLAGS} ${LINK_FLAG_NO_UNDEFINED}") ++ ENDIF() + ENDMACRO() + + FUNCTION(GET_DEPENDEND_OS_LIBS target result) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/mysql-patches/mysql-patches/mysql-community-server-5.5.7-plugins-avoid-version.patch new/mysql-patches/mysql-patches/mysql-community-server-5.5.7-plugins-avoid-version.patch --- old/mysql-patches/mysql-patches/mysql-community-server-5.5.7-plugins-avoid-version.patch 2010-12-23 16:15:03.000000000 +0100 +++ new/mysql-patches/mysql-patches/mysql-community-server-5.5.7-plugins-avoid-version.patch 1970-01-01 01:00:00.000000000 +0100 @@ -1,127 +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 = 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=$(AM_CXXFLAGS) -DMYSQL_DYNAMIC_PLUGIN - ha_blackhole_la_CFLAGS= $(AM_CFLAGS) -DMYSQL_DYNAMIC_PLUGIN - ha_blackhole_la_SOURCES=ha_blackhole.cc -Index: storage/archive/Makefile.am -=================================================================== ---- storage/archive/Makefile.am.orig -+++ storage/archive/Makefile.am -@@ -36,7 +36,7 @@ noinst_PROGRAMS = archive_test archive_r - - EXTRA_LTLIBRARIES = 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= $(AM_CXXFLAGS) -DMYSQL_DYNAMIC_PLUGIN - ha_archive_la_CFLAGS = $(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 = 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= $(AM_CXXFLAGS) -DMYSQL_DYNAMIC_PLUGIN - ha_example_la_CFLAGS = $(AM_CFLAGS) -DMYSQL_DYNAMIC_PLUGIN - ha_example_la_SOURCES = ha_example.cc -Index: storage/federated/Makefile.am -=================================================================== ---- storage/federated/Makefile.am.orig -+++ storage/federated/Makefile.am -@@ -35,7 +35,7 @@ noinst_HEADERS = ha_federated.h - - EXTRA_LTLIBRARIES = ha_federated.la - pkgplugin_LTLIBRARIES = @plugin_federated_shared_target@ --ha_federated_la_LDFLAGS = -module -rpath $(pkgplugindir) -+ha_federated_la_LDFLAGS = -module -avoid-version -rpath $(pkgplugindir) - ha_federated_la_CXXFLAGS= $(AM_CXXFLAGS) -DMYSQL_DYNAMIC_PLUGIN - ha_federated_la_CFLAGS = $(AM_CFLAGS) -DMYSQL_DYNAMIC_PLUGIN - ha_federated_la_SOURCES = ha_federated.cc -Index: plugin/audit_null/Makefile.am -=================================================================== ---- plugin/audit_null/Makefile.am.orig -+++ plugin/audit_null/Makefile.am -@@ -21,7 +21,7 @@ AM_CPPFLAGS = -I$(top_srcdir)/include - - EXTRA_LTLIBRARIES= adt_null.la - pkgplugin_LTLIBRARIES= @plugin_audit_null_shared_target@ --adt_null_la_LDFLAGS= -module -rpath $(pkgplugindir) -+adt_null_la_LDFLAGS= -module -avoid-version -rpath $(pkgplugindir) - adt_null_la_CPPFLAGS= $(AM_CPPFLAGS) -DMYSQL_DYNAMIC_PLUGIN - adt_null_la_SOURCES= audit_null.c - -Index: plugin/daemon_example/Makefile.am -=================================================================== ---- plugin/daemon_example/Makefile.am.orig -+++ plugin/daemon_example/Makefile.am -@@ -26,7 +26,7 @@ INCLUDES = -I$(top_srcdir)/ - - EXTRA_LTLIBRARIES = libdaemon_example.la - pkgplugin_LTLIBRARIES = @plugin_daemon_example_shared_target@ --libdaemon_example_la_LDFLAGS = -module -rpath $(pkgplugindir) -L$(top_builddir)/libservices -lmysqlservices -+libdaemon_example_la_LDFLAGS = -module -avoid-version -rpath $(pkgplugindir) -L$(top_builddir)/libservices -lmysqlservices - - libdaemon_example_la_CXXFLAGS= $(AM_CXXFLAGS) -DMYSQL_DYNAMIC_PLUGIN - libdaemon_example_la_CFLAGS = $(AM_CFLAGS) -DMYSQL_DYNAMIC_PLUGIN -Index: plugin/fulltext/Makefile.am -=================================================================== ---- plugin/fulltext/Makefile.am.orig -+++ plugin/fulltext/Makefile.am -@@ -20,6 +20,6 @@ INCLUDES= -I$(top_builddir)/include -I$( - #noinst_LTLIBRARIES= mypluglib.la - pkgplugin_LTLIBRARIES= mypluglib.la - mypluglib_la_SOURCES= plugin_example.c --mypluglib_la_LDFLAGS= -module -rpath $(pkgplugindir) -+mypluglib_la_LDFLAGS= -module -avoid-version -rpath $(pkgplugindir) - mypluglib_la_CFLAGS= -DMYSQL_DYNAMIC_PLUGIN - EXTRA_DIST= CMakeLists.txt -Index: plugin/semisync/Makefile.am -=================================================================== ---- plugin/semisync/Makefile.am.orig -+++ plugin/semisync/Makefile.am -@@ -25,12 +25,12 @@ noinst_HEADERS = semisync.h semisync_mas - - pkgplugin_LTLIBRARIES = semisync_master.la semisync_slave.la - --semisync_master_la_LDFLAGS = -module -rpath $(pkgplugindir) -L$(top_builddir)/libservices -lmysqlservices -+semisync_master_la_LDFLAGS = -module -avoid-version -rpath $(pkgplugindir) -L$(top_builddir)/libservices -lmysqlservices - semisync_master_la_CXXFLAGS= $(AM_CXXFLAGS) -DMYSQL_DYNAMIC_PLUGIN - semisync_master_la_CFLAGS = $(AM_CFLAGS) -DMYSQL_DYNAMIC_PLUGIN - semisync_master_la_SOURCES = semisync.cc semisync_master.cc semisync_master_plugin.cc - --semisync_slave_la_LDFLAGS = -module -rpath $(pkgplugindir) -L$(top_builddir)/libservices -lmysqlservices -+semisync_slave_la_LDFLAGS = -module -avoid-version -rpath $(pkgplugindir) -L$(top_builddir)/libservices -lmysqlservices - semisync_slave_la_CXXFLAGS= $(AM_CXXFLAGS) -DMYSQL_DYNAMIC_PLUGIN - semisync_slave_la_CFLAGS = $(AM_CFLAGS) -DMYSQL_DYNAMIC_PLUGIN - semisync_slave_la_SOURCES = semisync.cc semisync_slave.cc semisync_slave_plugin.cc -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 -Wno-pointer-sign -I$(top_srcdir)/include - - pkgplugin_LTLIBRARIES= auth.la auth_test_plugin.la ++++++ series ++++++ --- /var/tmp/diff_new_pack.0gtNXv/_old 2011-05-23 15:54:10.000000000 +0200 +++ /var/tmp/diff_new_pack.0gtNXv/_new 2011-05-23 15:54:10.000000000 +0200 @@ -11,3 +11,4 @@ mysql-community-server-5.1.51-mysql_config.patch mysql-community-server-5.1.51-mysqld_multi-features.patch mysql-community-server-5.1.51-upgrade-exit-status.patch +mysql-community-server-5.5.12-shared-libmysqld.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org