Hello community, here is the log from the commit of package xtrabackup for openSUSE:13.1 checked in at 2013-09-26 07:22:14 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:13.1/xtrabackup (Old) and /work/SRC/openSUSE:13.1/.xtrabackup.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "xtrabackup" Changes: -------- --- /work/SRC/openSUSE:13.1/xtrabackup/xtrabackup.changes 2013-09-23 11:24:11.000000000 +0200 +++ /work/SRC/openSUSE:13.1/.xtrabackup.new/xtrabackup.changes 2013-09-26 07:22:20.000000000 +0200 @@ -1,0 +2,6 @@ +Mon Sep 23 17:50:49 UTC 2013 - [email protected] + +- percona-xtrabackup-2.1.x-mysql-5.6.11-va_list.patch: Fix invalid use of + va_list + +------------------------------------------------------------------- New: ---- percona-xtrabackup-2.1.x-mysql-5.6.11-va_list.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ xtrabackup.spec ++++++ --- /var/tmp/diff_new_pack.FUdI59/_old 2013-09-26 07:22:21.000000000 +0200 +++ /var/tmp/diff_new_pack.FUdI59/_new 2013-09-26 07:22:21.000000000 +0200 @@ -32,6 +32,7 @@ Source4: xtrabackup-nodoc.sh Patch0: percona-xtrabackup-2.1.x-nodoc.patch Patch1: percona-xtrabackup-2.1.x-mysql-5.6.11-srv_buf_size.patch +Patch2: percona-xtrabackup-2.1.x-mysql-5.6.11-va_list.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build # This is to ease migration from Percona's generic packages Provides: percona-xtrabackup = %{version} @@ -81,6 +82,7 @@ %__find mysql-%{MYSQL_56_VERSION} -maxdepth 1 -type d -iname "doc*" -print && exit 1 %patch0 -p1 %patch1 -p1 +%patch2 -p1 %build set -ue ++++++ percona-xtrabackup-2.1.x-mysql-5.6.11-va_list.patch ++++++ Backport from mysql 5.6.13 Index: percona-xtrabackup-2.1.5/mysql-5.6.11/sql-common/client_plugin.c =================================================================== --- percona-xtrabackup-2.1.5.orig/mysql-5.6.11/sql-common/client_plugin.c +++ percona-xtrabackup-2.1.5/mysql-5.6.11/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); -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
