Hello community, here is the log from the commit of package mysql-community-server for openSUSE:Factory checked in at 2013-09-23 10:32:13 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/mysql-community-server (Old) and /work/SRC/openSUSE:Factory/.mysql-community-server.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "mysql-community-server" Changes: -------- --- /work/SRC/openSUSE:Factory/mysql-community-server/mysql-community-server.changes 2013-08-15 16:24:46.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.mysql-community-server.new/mysql-community-server.changes 2013-09-23 11:17:23.000000000 +0200 @@ -1,0 +2,19 @@ +Tue Sep 17 14:13:15 UTC 2013 - schwab@suse.de + +- mysql-community-server-5.6.12-va_list.patch: Fix invalid use of va_list + +------------------------------------------------------------------- +Mon Sep 9 10:35:47 CEST 2013 - mhrusecky@suse.cz + +- better version detection +- drop /etc/mysql dir, use upstream /etc/my.cfn.d only + +------------------------------------------------------------------- +Fri Aug 30 11:22:24 CEST 2013 - mhrusecky@suse.cz + +- include info file +- better README +- Build with -DOPENSSL_LOAD_CONF so mariadb respects + and load the system's openSSL configuration. + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ mysql-community-server.spec ++++++ --- /var/tmp/diff_new_pack.uCtq1P/_old 2013-09-23 11:17:24.000000000 +0200 +++ /var/tmp/diff_new_pack.uCtq1P/_new 2013-09-23 11:17:24.000000000 +0200 @@ -17,9 +17,10 @@ # Few definitions which will alter build -%define prefered 0 -%define use_cmake 1 -%define cluster 0 +%define prefered 00 +%define use_cmake 01 +%define cluster 00 +%define have_info 01 %define builtin_plugins partition,csv,heap,myisam,innobase %define use_extra_provides 1 %define extra_provides mysql-community-server_56 @@ -55,6 +56,9 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-build %if 0%{?suse_version} PreReq: pwdutils +%if %have_info +PreReq: %install_info_prereq %insserv_prereq +%endif %endif BuildRequires: autoconf BuildRequires: automake @@ -463,6 +467,10 @@ end %posttrans +%if %have_info +[ -z "`ls %{_infodir}/mysql.info.* 2> /dev/null`" ] || \ +%install_info --info-dir=%{_infodir} %{_infodir}/mysql.info.* +%endif if [ -d /var/lib/mysql ]; then touch /var/lib/mysql/.run-mysql_upgrade chown -R --no-dereference mysql:mysql /var/lib/mysql @@ -502,6 +510,9 @@ %postun if [ $1 = 0 ]; then + %if %have_info + %install_info_delete --info-dir=%{_infodir} %{_infodir}/mysql.info.* + %endif %{insserv_cleanup} rm -f "/var/lib/systemd/migrated/mysql.service" if [ -x /usr/bin/systemctl ]; then @@ -520,6 +531,9 @@ %config(noreplace) %attr(0640, root, mysql) /etc/my.cnf.d/* %config /etc/logrotate.d/mysql %doc %{_defaultdocdir}/%{name} +%if %have_info +%doc %{_infodir}/mysql.info.* +%endif /etc/init.d/mysql /usr/sbin/rcmysql %dir /usr/share/%{name} ++++++ README.SuSE ++++++ --- /var/tmp/diff_new_pack.uCtq1P/_old 2013-09-23 11:17:24.000000000 +0200 +++ /var/tmp/diff_new_pack.uCtq1P/_new 2013-09-23 11:17:24.000000000 +0200 @@ -55,3 +55,16 @@ /var/log/mysql/mysqld-upgrade.log +5) Migration from previous versions +=================================== + +If you are migrating from previous versions, you should take a look at official +documentation regarding migration: + + * 5.0 -> 5.1 series + https://dev.mysql.com/doc/refman/5.1/en/upgrading-from-previous-series.html + * 5.1 -> 5.5 series + https://dev.mysql.com/doc/refman/5.5/en/upgrading-from-previous-series.html + * 5.5 -> 5.6 series + https://dev.mysql.com/doc/refman/5.6/en/upgrading-from-previous-series.html + ++++++ build.inc ++++++ --- /var/tmp/diff_new_pack.uCtq1P/_old 2013-09-23 11:17:24.000000000 +0200 +++ /var/tmp/diff_new_pack.uCtq1P/_new 2013-09-23 11:17:24.000000000 +0200 @@ -9,7 +9,7 @@ %ifarch ppc64 export EXTRA_FLAGS=" -mminimal-toc " %endif -export CFLAGS="$RPM_OPT_FLAGS -DPIC -fPIC -DFORCE_INIT_OF_VARS $EXTRA_FLAGS " +export CFLAGS="$RPM_OPT_FLAGS -DOPENSSL_LOAD_CONF -DPIC -fPIC -DFORCE_INIT_OF_VARS $EXTRA_FLAGS " export CXXFLAGS="$CFLAGS -fno-exceptions -fno-rtti" %if 0%{use_cmake} < 1 ++++++ configuration-tweaks.tar.bz2 ++++++ ++++++ install.inc ++++++ --- /var/tmp/diff_new_pack.uCtq1P/_old 2013-09-23 11:17:24.000000000 +0200 +++ /var/tmp/diff_new_pack.uCtq1P/_new 2013-09-23 11:17:24.000000000 +0200 @@ -88,6 +88,7 @@ install -m 644 "${i}" "${DOCDIR}" || true done install -m 755 %_sourcedir/rc.mysql-multi %buildroot/etc/init.d/mysql +sed -i 's|@MYSQLVER@|%{version}|' %buildroot/etc/init.d/mysql ln -sf ../../etc/init.d/mysql %buildroot/usr/sbin/rcmysql # this is used by the init script install -m 755 -d %buildroot/var/run/mysql @@ -120,23 +121,6 @@ rm -f .$tmp done %endif -pushd '%buildroot'/%_libdir -for i in *.so.*.*.*; do - if [ -L "$i" ]; then - trg="`readlink "$i"`" - rm "$i" - mv "$trg" "$i" - ln -s "$i" "$trg" - fi -done -for i in *.so.*; do - if [ -L "$i" ] && [ -L "`readlink "$i"`" ]; then - trg="`readlink "$i"`" - rm "$i" - ln -s "`readlink "$trg"`" "$i" - fi -done -popd %if ! 0%{prefered} > 0 cat libmysqlclient-devel.files | sed 's|%%doc\ ||' | while read tmp; do cd '%buildroot' @@ -162,7 +146,9 @@ rm -rf '%buildroot'/etc/my.cnf.d mkdir -p '%buildroot'/etc/my.cnf.d bzip2 -cd '%_sourcedir'/configuration-tweaks.tar.bz2 | tar -C '%buildroot'/etc/my.cnf.d -xvf - +%if %have_info < 1 [ -z "`ls '%buildroot'/usr/share/info/mysql.info* 2> /dev/null`" ] || rm -f '%buildroot'/usr/share/info/mysql.info* +%endif if [ "`ls '%buildroot'%_libdir/mysql/plugin/dialog*.so 2> /dev/null`" ]; then echo '%%dir %%_libdir/mysql' >> mysql-client.files echo '%%dir %%_libdir/mysql/plugin' >> mysql-client.files ++++++ my.ini ++++++ --- /var/tmp/diff_new_pack.uCtq1P/_old 2013-09-23 11:17:24.000000000 +0200 +++ /var/tmp/diff_new_pack.uCtq1P/_new 2013-09-23 11:17:24.000000000 +0200 @@ -98,6 +98,5 @@ # socket = /var/lib/mysql-databases/mysqld6/mysql.sock # user = mysql -!includedir /etc/mysql !includedir /etc/my.cnf.d ++++++ mysql-patches.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/mysql-patches/mysql-patches/mysql-community-server-5.6.12-va_list.patch new/mysql-patches/mysql-patches/mysql-community-server-5.6.12-va_list.patch --- old/mysql-patches/mysql-patches/mysql-community-server-5.6.12-va_list.patch 1970-01-01 01:00:00.000000000 +0100 +++ new/mysql-patches/mysql-patches/mysql-community-server-5.6.12-va_list.patch 2013-09-17 11:47:01.000000000 +0200 @@ -0,0 +1,79 @@ +PATCH-P1-FIX-UPSTREAM: va_list is not compatible with int + +Backport from 5.6.13 + +Index: mysql-5.6.12/sql-common/client_plugin.c +=================================================================== +--- mysql-5.6.12.orig/sql-common/client_plugin.c ++++ mysql-5.6.12/sql-common/client_plugin.c +@@ -117,8 +117,9 @@ find_plugin(const char *name, int type) + @retval a pointer to an installed plugin or 0 + */ + static struct st_mysql_client_plugin * +-add_plugin(MYSQL *mysql, struct st_mysql_client_plugin *plugin, void *dlhandle, +- int argc, va_list args) ++do_add_plugin(MYSQL *mysql, struct st_mysql_client_plugin *plugin, ++ void *dlhandle, ++ int argc, va_list args) + { + const char *errmsg; + struct st_client_plugin_int plugin_int, *p; +@@ -179,6 +180,31 @@ err1: + return NULL; + } + ++ ++static struct st_mysql_client_plugin * ++add_plugin_noargs(MYSQL *mysql, struct st_mysql_client_plugin *plugin, ++ void *dlhandle, ++ int argc, ...) ++{ ++ struct st_mysql_client_plugin *retval= NULL; ++ va_list ap; ++ va_start(ap, argc); ++ retval= do_add_plugin(mysql, plugin, dlhandle, argc, ap); ++ va_end(ap); ++ return retval; ++} ++ ++ ++static struct st_mysql_client_plugin * ++add_plugin_withargs(MYSQL *mysql, struct st_mysql_client_plugin *plugin, ++ void *dlhandle, ++ int argc, va_list args) ++{ ++ return do_add_plugin(mysql, plugin, dlhandle, argc, args); ++} ++ ++ ++ + /** + Loads plugins which are specified in the environment variable + LIBMYSQL_PLUGINS. +@@ -249,7 +275,7 @@ int mysql_client_plugin_init() + mysql_mutex_lock(&LOCK_load_client_plugin); + + for (builtin= mysql_client_builtins; *builtin; builtin++) +- add_plugin(&mysql, *builtin, 0, 0, 0); ++ add_plugin_noargs(&mysql, *builtin, 0, 0); + + mysql_mutex_unlock(&LOCK_load_client_plugin); + +@@ -307,7 +333,7 @@ mysql_client_register_plugin(MYSQL *mysq + plugin= NULL; + } + else +- plugin= add_plugin(mysql, plugin, 0, 0, 0); ++ plugin= add_plugin_noargs(mysql, plugin, 0, 0); + + mysql_mutex_unlock(&LOCK_load_client_plugin); + return plugin; +@@ -420,7 +446,7 @@ have_plugin: + goto err; + } + +- plugin= add_plugin(mysql, plugin, dlhandle, argc, args); ++ plugin= add_plugin_withargs(mysql, plugin, dlhandle, argc, args); + + mysql_mutex_unlock(&LOCK_load_client_plugin); + ++++++ rc.mysql-multi ++++++ --- /var/tmp/diff_new_pack.uCtq1P/_old 2013-09-23 11:17:24.000000000 +0200 +++ /var/tmp/diff_new_pack.uCtq1P/_new 2013-09-23 11:17:24.000000000 +0200 @@ -334,7 +334,7 @@ chown -R --no-dereference mysql:mysql "$log_dir" done - MYSQLVER="`mysqld --version | sed 's|.*Ver\ *\([^\ ]*\)\.[0-9]\+[\-\ ].*|\1|'`" + MYSQLVER="`echo @MYSQLVER@ | sed 's|\.[0-9]\+$||'`" # We assume a fresh install if the directory $datadir/mysql # does not exist and create the privilege database @@ -351,6 +351,7 @@ # user confirmation. if [ -f "/var/lib/mysql/.run-mysql_upgrade" ]; then if [ \! -f "/var/lib/mysql/.force_upgrade" ] && \ + [ -f "$datadir/mysql_upgrade_info" ] && \ [ -z "`grep "^$MYSQLVER" "$datadir/mysql_upgrade_info" 2> /dev/null`" ]; then echo echo "You are upgrading from different stable version of MySQL!" ++++++ series ++++++ --- /var/tmp/diff_new_pack.uCtq1P/_old 2013-09-23 11:17:24.000000000 +0200 +++ /var/tmp/diff_new_pack.uCtq1P/_new 2013-09-23 11:17:24.000000000 +0200 @@ -11,3 +11,4 @@ mysql-5.5.31-upgrade-datadir.patch mysql-5.5-dump.patch mysql-community-server-5.6.12-srv_buf_size.patch +mysql-community-server-5.6.12-va_list.patch -- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org