Hello community, here is the log from the commit of package mysql-community-server for openSUSE:Factory checked in at 2012-06-26 17:47:37 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/mysql-community-server (Old) and /work/SRC/openSUSE:Factory/.mysql-community-server.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "mysql-community-server", Maintainer is "" Changes: -------- --- /work/SRC/openSUSE:Factory/mysql-community-server/mysql-community-server.changes 2012-04-17 22:00:12.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.mysql-community-server.new/mysql-community-server.changes 2012-06-26 17:47:39.000000000 +0200 @@ -1,0 +2,16 @@ +Tue Jun 19 22:28:24 UTC 2012 - stefan.bru...@rwth-aachen.de + +- split off files containing error messages, needed by both + standalone and embedded server (bnc#712749) +- bail out early on broken error message files, instead of + failing silently later ( http://bugs.mysql.com/bug.php?id=39693 ) + +------------------------------------------------------------------- +Tue Jun 12 08:19:02 CEST 2012 - mhruse...@suse.cz + +- updated to 5.5.25, see + http://dev.mysql.com/doc/refman/5.5/en/news-5-5-23.html + http://dev.mysql.com/doc/refman/5.5/en/news-5-5-24.html + http://dev.mysql.com/doc/refman/5.5/en/news-5-5-25.html + +------------------------------------------------------------------- Old: ---- mysql-5.5.22.tar.bz2 New: ---- mysql-5.5.25.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ mysql-community-server.spec ++++++ --- /var/tmp/diff_new_pack.P6H3Sf/_old 2012-06-26 17:47:42.000000000 +0200 +++ /var/tmp/diff_new_pack.P6H3Sf/_new 2012-06-26 17:47:42.000000000 +0200 @@ -34,9 +34,9 @@ Name: mysql-community-server Summary: Server part of MySQL Community Server -Version: 5.5.22 +Version: 5.5.25 Release: 1 -%define srv_vers 5.5.22 +%define srv_vers 5.5.25 License: SUSE-GPL-2.0-with-FLOSS-exception Group: Productivity/Databases/Servers Url: http://www.mysql.com @@ -76,6 +76,7 @@ %endif # required by rcmysql Requires: %{name}-client perl-base +Requires: %{name}-errormessages = %version Provides: mysql-Max = %{srv_vers} Provides: mysql = %{srv_vers} %if 0%{?use_extra_provides} > 0 @@ -180,6 +181,7 @@ %if 0%{?use_extra_provides} > 0 Provides: %{extra_provides}-client = %{version} Obsoletes: %{extra_provides}-client < %{version} +Requires: %{name}-errormessages = %version %endif %if 0%{?prefered} > 0 Obsoletes: mysql-client < %{srv_vers} @@ -189,6 +191,14 @@ %description client This package contains the standard clients for MySQL Community Server. +%package errormessages +Summary: MySQL Community Server development header files and libraries +Group: Development/Libraries/C and C++ + +%description errormessages +This package provides the translated error messages for the standalone +server daemon as well as the embedded server + %package bench Requires: %{name}-client perl-DBD-mysql License: SUSE-GPL-2.0-with-FLOSS-exception @@ -356,7 +366,9 @@ # remove unneeded manpages ('make install' basically installs everything under # man/*) rm -f man/mysqlman.1 # dummy fallback manpage +[ \! -f man/CMakeLists.txt ] || sed -i 's|mysqlman.1||' man/CMakeLists.txt rm -f man/mysql.server.1 # init script, not installed in our rpm +[ \! -f man/CMakeLists.txt ] || sed -i 's|mysql.server.1||' man/CMakeLists.txt rm -f man/make_win_*.1 # windows build scripts rm -f man/comp_err.1 # built-time utility # 5.1 Carrier Grade Edition only / still under development as of 5.1.22 @@ -469,13 +481,22 @@ %doc %{_infodir}/mysql.info.* /etc/init.d/mysql /usr/sbin/rcmysql -/usr/share/mysql/ +%dir /usr/share/%{name} +%dir /usr/share/mysql +/usr/share/%{name}/charsets/ +/usr/share/mysql/*.cnf +/usr/share/mysql/*.ini +/usr/share/%{name}/*.sql %ghost %dir %attr(755,mysql,mysql)/var/run/mysql %dir %{_libdir}/mysql %{_libdir}/mysql/mysqld.sym %config /etc/sysconfig/SuSEfirewall2.d/services/mysql %dir %_libdir/mysql/plugin -%_libdir/mysql/plugin/*.so +%_libdir/mysql/plugin/[!d]*.so + +%files errormessages -f errormessages.files +%defattr(-, root, root) +/usr/share/%{name}/*/errmsg.sys %files client -f mysql-client.files %defattr(-, root, root) ++++++ build.inc ++++++ --- /var/tmp/diff_new_pack.P6H3Sf/_old 2012-06-26 17:47:42.000000000 +0200 +++ /var/tmp/diff_new_pack.P6H3Sf/_new 2012-06-26 17:47:42.000000000 +0200 @@ -102,6 +102,7 @@ -DWITH_LIBEDIT=0 \ -DINSTALL_LAYOUT=RPM \ -DMYSQL_UNIX_ADDR=%{socketpath}/mysql.sock \ + -DINSTALL_MYSQLSHAREDIR=/usr/share/%{name} \ -DWITH_COMMENT="openSUSE MySQL rpm" \ -DWITH_EXTRA_CHARSET=all \ -DDEFAULT_CHARSET=utf8 -DDEFAULT_COLLATION=utf8_general_ci \ ++++++ configuration-tweaks.tar.bz2 ++++++ ++++++ install.inc ++++++ --- /var/tmp/diff_new_pack.P6H3Sf/_old 2012-06-26 17:47:42.000000000 +0200 +++ /var/tmp/diff_new_pack.P6H3Sf/_new 2012-06-26 17:47:42.000000000 +0200 @@ -20,6 +20,11 @@ rm -f %buildroot%_libdir/mysql/libndbclient.* rm -f %{buildroot}/usr/share/mysql-test/mysql-test-run rm -f %{buildroot}/usr/share/mysql-test/mtr +rm -f %{buildroot}/usr/share/mysql/binary-configure +rm -f %{buildroot}/usr/share/mysql/errmsg-utf8.txt +rm -f %{buildroot}/usr/share/mysql/magic +rm -f %{buildroot}/usr/share/mysql/mysql-log-rotate +rm -f %{buildroot}/usr/share/mysql/mysql*.server rm -f %{buildroot}%{_libdir}/mysql/plugin/daemon_example.ini ln -sf mysql-test-run.pl %{buildroot}/usr/share/mysql-test/mtr ln -sf mysql-test-run.pl %{buildroot}/usr/share/mysql-test/mysql-test-run @@ -56,6 +61,19 @@ filelist ndb_mgmd >mysql-ndb-management.files filelist ndb_{config,desc,error_reporter,mgm,print_backup_file,print_schema_file,print_sys_file,restore,select_all,select_count,show_tables,size.pl,test_platform,waiter} >mysql-ndb-tools.files filelist ndb_{cpcd,delete_all,drop_index,index_stat,print_file,redo_log_reader,drop_table} ndbinfo_select_all memcached >mysql-ndb-extra.files +errmsg_list() +{ + echo '%%defattr(-, root, root)' + pushd %buildroot >/dev/null + for f in usr/share/%{name}/*; do + if test -e $f/errmsg.sys; then + echo "%%dir /$f" + fi + done + echo /usr/share/%{name}/errmsg-utf8.txt + popd >/dev/null +} +errmsg_list > errormessages.files ### files not installed by make install # Create directory structure DOCS=(COPYING README EXCEPTIONS-CLIENT %_sourcedir/README.debug %_sourcedir/README.SuSE plugin/daemon_example/daemon_example.ini) @@ -136,3 +154,15 @@ fi mkdir -p '%buildroot'/etc/mysql bzip2 -cd '%_sourcedir'/configuration-tweaks.tar.bz2 | tar -C '%buildroot'/etc/mysql -xvf - +if [ -z "`ls '%buildroot'/usr/share/info/mysql.info*`" ]; then + install -D -m 0644 Docs/mysql.info "%buildroot/usr/share/info/mysql.info" + gzip -9 "%buildroot/usr/share/info/mysql.info" +fi +if [ "`ls '%buildroot'%_libdir/mysql/plugin/dialog*.so`" ]; then + echo '%%dir %%_libdir/mysql' >> mysql-client.files + echo '%%dir %%_libdir/mysql/plugin' >> mysql-client.files + echo '%%_libdir/mysql/plugin/dialog*.so' >> mysql-client.files +fi +rm -rf '%buildroot'/etc/my.cnf.d +rm -rf '%buildroot'/usr/share/doc/%{name}-%{version} +rm -rf '%buildroot'/usr/share/mysql/SELinux ++++++ mysql-5.5.22.tar.bz2 -> mysql-5.5.25.tar.bz2 ++++++ /work/SRC/openSUSE:Factory/mysql-community-server/mysql-5.5.22.tar.bz2 /work/SRC/openSUSE:Factory/.mysql-community-server.new/mysql-5.5.25.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/mysql-community-server-5.5.23-fail_on_missing_errmsg_sys.patch new/mysql-patches/mysql-patches/mysql-community-server-5.5.23-fail_on_missing_errmsg_sys.patch --- old/mysql-patches/mysql-patches/mysql-community-server-5.5.23-fail_on_missing_errmsg_sys.patch 1970-01-01 01:00:00.000000000 +0100 +++ new/mysql-patches/mysql-patches/mysql-community-server-5.5.23-fail_on_missing_errmsg_sys.patch 2012-06-20 11:04:08.000000000 +0200 @@ -0,0 +1,76 @@ +PATCH-P1-FIX-UPSTREAM: error reporting for mysql_library_init +BUGS: upstream#39693 bnc#712749 + +Making verbose errors even from embedded library. + +Maintainer: Michal Hrusecky <michal.hruse...@opensuse.org> + +--- mysql-5.5.22/sql/derror.cc_orig 2012-06-19 23:55:39.149443013 +0200 ++++ mysql-5.5.22/sql/derror.cc 2012-06-20 00:44:14.340235965 +0200 +@@ -56,25 +56,39 @@ + + bool init_errmessage(void) + { +- const char **errmsgs, **ptr; ++ const char **errmsgs, **ptr, **old_errmsgs; + DBUG_ENTER("init_errmessage"); + + /* + Get a pointer to the old error messages pointer array. + read_texts() tries to free it. + */ +- errmsgs= my_error_unregister(ER_ERROR_FIRST, ER_ERROR_LAST); ++ old_errmsgs= my_error_unregister(ER_ERROR_FIRST, ER_ERROR_LAST); + + /* Read messages from file. */ + if (read_texts(ERRMSG_FILE, my_default_lc_messages->errmsgs->language, +- &errmsgs, ER_ERROR_LAST - ER_ERROR_FIRST + 1) && +- !errmsgs) ++ &errmsgs, ER_ERROR_LAST - ER_ERROR_FIRST + 1)) + { +- if (!(errmsgs= (const char**) my_malloc((ER_ERROR_LAST-ER_ERROR_FIRST+1)* +- sizeof(char*), MYF(0)))) +- DBUG_RETURN(TRUE); +- for (ptr= errmsgs; ptr < errmsgs + ER_ERROR_LAST - ER_ERROR_FIRST; ptr++) +- *ptr= ""; ++ my_free(errmsgs); ++ ++ if (old_errmsgs) ++ { ++ errmsgs = old_errmsgs; // reuse old messages ++ } ++ else ++ { ++ // try to build an temporary array to avoid illegal accesses to the message array ++ if (!(errmsgs= (const char**) my_malloc((ER_ERROR_LAST-ER_ERROR_FIRST+1)* ++ sizeof(char*), MYF(0)))) ++ DBUG_RETURN(TRUE); ++ ++ for (ptr= errmsgs; ptr < errmsgs + ER_ERROR_LAST - ER_ERROR_FIRST; ptr++) ++ *ptr= ""; ++ } ++ } ++ else ++ { ++ my_free(old_errmsgs); + } + + /* Register messages for use with my_error(). */ +@@ -86,6 +100,8 @@ + + DEFAULT_ERRMSGS= errmsgs; /* Init global variable */ + init_myfunc_errs(); /* Init myfunc messages */ ++ if (errmsgs[0][0] == '\0') ++ DBUG_RETURN(TRUE); + DBUG_RETURN(FALSE); + } + +@@ -155,8 +171,6 @@ + DBUG_RETURN(1); + } + +- /* Free old language */ +- my_free(*point); + if (!(*point= (const char**) + my_malloc((size_t) (length+count*sizeof(char*)),MYF(0)))) + { ++++++ series ++++++ --- /var/tmp/diff_new_pack.P6H3Sf/_old 2012-06-26 17:47:42.000000000 +0200 +++ /var/tmp/diff_new_pack.P6H3Sf/_new 2012-06-26 17:47:42.000000000 +0200 @@ -14,3 +14,4 @@ mysql-community-server-5.5.12-shared-libmysqld.patch mysql-community-server-5.5.21-va_list-handling.patch mysql-community-server-5.5.21-ppc64-libdir.patch +mysql-community-server-5.5.23-fail_on_missing_errmsg_sys.patch -- To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org For additional commands, e-mail: opensuse-commit+h...@opensuse.org