From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) by finch.gentoo.org (Postfix) with ESMTP id 5ED331385AD for ; Sun, 20 Jan 2013 23:03:15 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 0D12321C082; Sun, 20 Jan 2013 23:03:14 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 8655F21C082 for ; Sun, 20 Jan 2013 23:03:13 +0000 (UTC) Received: from hornbill.gentoo.org (hornbill.gentoo.org [94.100.119.163]) (using TLSv1 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 96A8833DADC for ; Sun, 20 Jan 2013 23:03:12 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by hornbill.gentoo.org (Postfix) with ESMTP id 37322E4073 for ; Sun, 20 Jan 2013 23:03:11 +0000 (UTC) From: "Robin H. Johnson" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Robin H. Johnson" Message-ID: <1358655025.cff00b7bef9779f996077e340d8336eb636718a1.robbat2@gentoo> Subject: [gentoo-commits] proj/mysql-extras:master commit in: / X-VCS-Repository: proj/mysql-extras X-VCS-Files: 00000_index.txt 20002_all_mysql-va-list.patch X-VCS-Directories: / X-VCS-Committer: robbat2 X-VCS-Committer-Name: Robin H. Johnson X-VCS-Revision: cff00b7bef9779f996077e340d8336eb636718a1 X-VCS-Branch: master Date: Sun, 20 Jan 2013 23:03:11 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: 9d00de74-b27e-49e0-896c-24b9d591e98d X-Archives-Hash: 51187fb7d0eb69fb848d9dede34eab4a commit: cff00b7bef9779f996077e340d8336eb636718a1 Author: Brian Evans lavabit com> AuthorDate: Sun Jan 20 03:45:03 2013 +0000 Commit: Robin H. Johnson gentoo org> CommitDate: Sun Jan 20 04:10:25 2013 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=proj/mysql-extras.git;a=commit;h=cff00b7b Patch for bug 442000. Use empty va_list across all arches. --- 00000_index.txt | 5 ++++ 20002_all_mysql-va-list.patch | 49 +++++++++++++++++++++++++++++++++++++++++ 2 files changed, 54 insertions(+), 0 deletions(-) diff --git a/00000_index.txt b/00000_index.txt index dbee56e..ab3621f 100644 --- a/00000_index.txt +++ b/00000_index.txt @@ -1456,3 +1456,8 @@ @ver 5.05.25.00 to 5.05.26.99 @pn mariadb @@ Fix sql + +@patch 20002_all_mysql-va-list.patch +@ver 5.05.00.00 to 5.99.99.99 +@pn mysql +@@ Bug 442000, upstream 62729 compilation failure on arm and possibly other arches where va_list is a struct or array. diff --git a/20002_all_mysql-va-list.patch b/20002_all_mysql-va-list.patch new file mode 100644 index 0000000..2375aa1 --- /dev/null +++ b/20002_all_mysql-va-list.patch @@ -0,0 +1,49 @@ +diff -Naur mysql-5.5.16.orig/sql-common/client_plugin.c mysql-5.5.16/sql-common/client_plugin.c +--- mysql-5.5.16.orig/sql-common/client_plugin.c 2011-09-09 11:56:39.000000000 -0400 ++++ mysql-5.5.16/sql-common/client_plugin.c 2011-10-16 23:00:00.708799138 -0400 +@@ -228,11 +228,13 @@ + { + MYSQL mysql; + struct st_mysql_client_plugin **builtin; ++ va_list unused; + + if (initialized) + return 0; + + bzero(&mysql, sizeof(mysql)); /* dummy mysql for set_mysql_extended_error */ ++ bzero(&unused, sizeof(unused)); /* suppress uninitialized-value warnings */ + + pthread_mutex_init(&LOCK_load_client_plugin, MY_MUTEX_INIT_SLOW); + init_alloc_root(&mem_root, 128, 128); +@@ -244,7 +246,7 @@ + pthread_mutex_lock(&LOCK_load_client_plugin); + + for (builtin= mysql_client_builtins; *builtin; builtin++) +- add_plugin(&mysql, *builtin, 0, 0, 0); ++ add_plugin(&mysql, *builtin, 0, 0, unused); + + pthread_mutex_unlock(&LOCK_load_client_plugin); + +@@ -288,9 +290,13 @@ + mysql_client_register_plugin(MYSQL *mysql, + struct st_mysql_client_plugin *plugin) + { ++ va_list unused; ++ + if (is_not_initialized(mysql, plugin->name)) + return NULL; + ++ bzero(&unused, sizeof(unused)); /* suppress uninitialized-value warnings */ ++ + pthread_mutex_lock(&LOCK_load_client_plugin); + + /* make sure the plugin wasn't loaded meanwhile */ +@@ -302,7 +308,7 @@ + plugin= NULL; + } + else +- plugin= add_plugin(mysql, plugin, 0, 0, 0); ++ plugin= add_plugin(mysql, plugin, 0, 0, unused); + + pthread_mutex_unlock(&LOCK_load_client_plugin); + return plugin;